|
@@ -1,27 +1,29 @@
|
|
|
-From 00995e0b8a66fbd0eabd206188120bfc1ecdac59 Mon Sep 17 00:00:00 2001
|
|
|
-Message-Id: <00995e0b8a66fbd0eabd206188120bfc1ecdac59.1398245232.git.baruch@tkos.co.il>
|
|
|
+From 9ff39800cec5f1dabba246b253794582d611bc6d Mon Sep 17 00:00:00 2001
|
|
|
From: Baruch Siach <baruch@tkos.co.il>
|
|
|
-Date: Wed, 23 Apr 2014 12:21:37 +0300
|
|
|
+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 2c7f8d62a42b..cec614fba041 100644
|
|
|
+index fdf01ec..34ae26e 100644
|
|
|
--- a/CMakeLists.txt
|
|
|
+++ b/CMakeLists.txt
|
|
|
-@@ -77,7 +77,7 @@ if(ANDROID_PLATFORM)
|
|
|
- add_subdirectory(android/NE10Demo/jni)
|
|
|
- endif()
|
|
|
+@@ -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 "-O2 -mthumb-interwork -mthumb -march=armv7-a -mfpu=vfp3")
|
|
|
-+ set(CMAKE_C_FLAGS "-O2 -mthumb-interwork -march=armv7-a -mfpu=vfp3")
|
|
|
- set(CMAKE_ASM_FLAGS "-mthumb-interwork -mthumb -march=armv7-a -mfpu=neon")
|
|
|
+- 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.2
|
|
|
+1.9.1
|
|
|
|