[cmake]: Change to shorter RKPLATFORM macro

Change Android and Linux branches to use RKPLATFORM macro. RKPLATFORM is shorter and it is not a cmake variable. Change-Id: I09a6fe72e7dacedbb4b2b8e1a66b6f7ca625f019 Signed-off-by: Herman Chen <[email protected]>
rockchip-linux · Dec 19, 2017 · b186d04 · b186d04
1 parent 81759e8
commit b186d04
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,12 +31,10 @@ if(NOT COMMAND find_host_program)
     endmacro()
 endif()
 
-option(RKPLATFORM "Enable RK HW CONFIG" OFF)
-if(${CMAKE_RKPLATFORM_ENABLE} MATCHES "ON")
-    option(RKPLATFORM "Enable RK HW CONFIG" ON)
-    set(RKPLATFORM True)
-    add_definitions(-DRKPLATFORM)
-endif()
+set(RKPLATFORM "" CACHE BOOL "Enable RK HW CONFIG")
+if (RKPLATFORM)
+    ADD_DEFINITIONS(-DRKPLATFORM)
+endif(RKPLATFORM)
 
 project (rk_mpp)
 

diff --git a/build/android/aarch64/make-Android.bash b/build/android/aarch64/make-Android.bash
@@ -18,7 +18,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake                     \
       -DANDROID_TOOLCHAIN_NAME="aarch64-linux-android-4.9"                  \
       -DANDROID_NATIVE_API_LEVEL=android-21                                 \
       -DANDROID_STL=system                                                  \
-      -DCMAKE_RKPLATFORM_ENABLE=ON                                          \
+      -DRKPLATFORM=ON                                                       \
       ../../../
 
 # ----------------------------------------------------------------------------

diff --git a/build/android/arm/make-Android.bash b/build/android/arm/make-Android.bash
@@ -18,7 +18,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake                     \
       -DANDROID_TOOLCHAIN_NAME="arm-linux-androideabi-4.8"                  \
       -DANDROID_NATIVE_API_LEVEL=android-21                                 \
       -DANDROID_STL=system                                                  \
-      -DCMAKE_RKPLATFORM_ENABLE=ON                                          \
+      -DRKPLATFORM=ON                                                       \
       ../../../
 
 # ----------------------------------------------------------------------------

diff --git a/build/android/x86/make-Android.bash b/build/android/x86/make-Android.bash
@@ -18,7 +18,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake                     \
       -DANDROID_TOOLCHAIN_NAME="x86-4.8"                                    \
       -DANDROID_NATIVE_API_LEVEL=android-21                                 \
       -DANDROID_STL=system                                                  \
-      -DCMAKE_RKPLATFORM_ENABLE=ON                                          \
+      -DRKPLATFORM=ON                                                       \
       ../../../
 
 # ----------------------------------------------------------------------------

diff --git a/build/linux/aarch64/make-Makefiles.bash b/build/linux/aarch64/make-Makefiles.bash
@@ -23,6 +23,6 @@ fi
 # generate Makefile
 cmake -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_TOOLCHAIN_FILE=./arm.linux.cross.cmake \
-      -DCMAKE_RKPLATFORM_ENABLE=ON \
+      -DRKPLATFORM=ON \
       -G "Unix Makefiles" \
       ${MPP_TOP}
diff --git a/build/linux/arm/make-Makefiles.bash b/build/linux/arm/make-Makefiles.bash
@@ -23,6 +23,6 @@ fi
 # generate Makefile
 cmake -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_TOOLCHAIN_FILE=./arm.linux.cross.cmake \
-      -DCMAKE_RKPLATFORM_ENABLE=ON \
+      -DRKPLATFORM=ON \
       -G "Unix Makefiles" \
       ${MPP_TOP}
diff --git a/build/linux/x86/sofia-3gr/make-Makefiles.bash b/build/linux/x86/sofia-3gr/make-Makefiles.bash
@@ -2,5 +2,5 @@
 # Run this from within a bash shell
 cmake -G "Unix Makefiles" \
 	-DCMAKE_TOOLCHAIN_FILE=./sofia-3gr.linux.cross.cmake \
-	-DCMAKE_RKPLATFORM_ENABLE=ON \
+	-DRKPLATFORM=ON \
 	../../../../  && ccmake  ../../../../
diff --git a/build/linux/x86_64/make-Makefiles.bash b/build/linux/x86_64/make-Makefiles.bash
@@ -3,5 +3,5 @@
 # x86_64 is for simulation do not enable RK platform
 cmake -G "Unix Makefiles" \
     -DCMAKE_BUILD_TYPE=debug \
-    -DCMAKE_RKPLATFORM_ENABLE=OFF \
+    -DRKPLATFORM=OFF \
     ../../../  && ccmake  ../../../
diff --git a/debian/rules b/debian/rules
@@ -26,6 +26,6 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 	-DCMAKE_TOOLCHAIN_FILE=/etc/dpkg-cross/cmake/CMakeCross.txt \
 	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_RKPLATFORM_ENABLE=ON \
+	-DRKPLATFORM=ON \
 	-DHAVE_DRM=ON \
 	-DARM_MIX_32_64=ON