From 06807e8a335d85de0de8b2da8ab0dcbfd86f8e64 Mon Sep 17 00:00:00 2001
From: ChenHengming <ChenHengming@6e48237b-75ef-9749-8fc9-41990f28c85a>
Date: Wed, 3 Aug 2016 06:43:01 +0000
Subject: [PATCH] [cmake]: fix script for arm-linux

git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@1148 6e48237b-75ef-9749-8fc9-41990f28c85a
---
 CMakeLists.txt                      | 13 +++++++------
 build/linux/arm/make-Makefiles.bash |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d810491e..0a3b42a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,18 +163,19 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
 endif()
 
 if(GCC)
-    if(X64 AND NOT WIN32)
-        add_definitions(-fPIC)
-    endif(X64 AND NOT WIN32)
-    if(X86 AND NOT X64)
-        add_definitions(-march=i686)
-    endif()
     if(ARM)
         if(ARMEABI_V6)
             add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)
         elseif(ARMEABI_V7A)
             add_definitions(-march=armv7-a -mfloat-abi=softfp -mfpu=neon)
         endif()
+    else()
+        if(X64 AND NOT WIN32)
+            add_definitions(-fPIC)
+        endif(X64 AND NOT WIN32)
+        if(X86 AND NOT X64)
+            add_definitions(-march=i686)
+        endif()
     endif()
     # disable multichar warning
     add_definitions(-Wno-multichar)
diff --git a/build/linux/arm/make-Makefiles.bash b/build/linux/arm/make-Makefiles.bash
index 5104b021..bb767aa1 100755
--- a/build/linux/arm/make-Makefiles.bash
+++ b/build/linux/arm/make-Makefiles.bash
@@ -3,4 +3,4 @@
 cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=debug \
     -DCMAKE_TOOLCHAIN_FILE=./arm.linux.cross.cmake \
     -DCMAKE_RKPLATFORM_ENABLE=ON                   \
-    ../../../  && ccmake  ../../../
+    ../../../  && cmake --build .