8cdf680799
Bump to version 1.2.0, fixup patch, and add ensure package is installed to the staging directory. [Peter: keep Baruch's authorship on patch] Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 9ff39800cec5f1dabba246b253794582d611bc6d Mon Sep 17 00:00:00 2001
|
|
From: Baruch Siach <baruch@tkos.co.il>
|
|
Date: Fri, 20 Feb 2015 10:44:15 -0600
|
|
Subject: [PATCH] CMakeLists: don't hard code thumb code generation
|
|
|
|
Migrating to version 1.2.0
|
|
|
|
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
|
|
---
|
|
CMakeLists.txt | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index fdf01ec..34ae26e 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -84,7 +84,7 @@ if(ANDROID_PLATFORM)
|
|
${ANDROID_TOOLCHAIN_PATH}/arm-linux-androideabi-ar
|
|
${ANDROID_TOOLCHAIN_PATH}/arm-linux-androideabi-ranlib")
|
|
elseif(GNULINUX_PLATFORM)
|
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=vfp3")
|
|
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -march=armv7-a -mfpu=vfp3")
|
|
set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=neon")
|
|
elseif(IOS_PLATFORM)
|
|
#set minimal target ios version.If not provided this option, Xcode
|
|
--
|
|
1.9.1
|
|
|