Move cmake buildtool flag setting (#4893)

Move cmake buildtool flag setting file into cmake/buildtool/

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/cmake/ApplyCompileFlags.cmake b/cmake/ApplyCompileFlags.cmake
index ba01444..5098fd0 100644 (file)
--- a/cmake/ApplyCompileFlags.cmake
+++ b/cmake/ApplyCompileFlags.cmake
@@ -10,11 +10,11 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
 #
 # Platform specific compile flag setting
 #
-include("cmake/option/option_${TARGET_PLATFORM}.cmake")
+include("cmake/buildtool/config/config_${TARGET_PLATFORM}.cmake")
 
 #
 # Apply compile flags
-# note: this should be placed after cmake/option/option_xxx.cmake files
+# note: this should be placed after cmake/buildtool/config/config_xxx.cmake files
 #
 # add common flags
 foreach(FLAG ${FLAGS_COMMON})

diff --git a/cmake/option/option_aarch64-linux.cmake b/cmake/buildtool/config/config_aarch64-linux.cmake
similarity index 84%
rename from cmake/option/option_aarch64-linux.cmake
rename to cmake/buildtool/config/config_aarch64-linux.cmake
index fa5c920..cdde5e3 100644 (file)
--- a/cmake/option/option_aarch64-linux.cmake
+++ b/cmake/buildtool/config/config_aarch64-linux.cmake
@@ -5,7 +5,7 @@
 message(STATUS "Building for AARCH64 Linux")
 
 # include linux common
-include("cmake/option/option_linux.cmake")
+include("cmake/buildtool/config/config_linux.cmake")
 
 if(NOT EXISTS "${ROOTFS_ARM64}/lib/aarch64-linux-gnu")
   message(FATAL_ERROR "Please prepare RootFS for ARM64")

diff --git a/cmake/option/option_aarch64-tizen.cmake b/cmake/buildtool/config/config_aarch64-tizen.cmake
similarity index 84%
rename from cmake/option/option_aarch64-tizen.cmake
rename to cmake/buildtool/config/config_aarch64-tizen.cmake
index 5e37f35..b6a3794 100644 (file)
--- a/cmake/option/option_aarch64-tizen.cmake
+++ b/cmake/buildtool/config/config_aarch64-tizen.cmake
@@ -6,7 +6,7 @@ message(STATUS "Building for AARCH64 Tizen")
 
 # TODO : add and use option_tizen if something uncommon comes up
 # include linux common
-include("cmake/option/option_linux.cmake")
+include("cmake/buildtool/config/config_linux.cmake")
 
 # TODO : support rootfs setting for tizen cross-build
 

diff --git a/cmake/option/option_arm64-android.cmake b/cmake/buildtool/config/config_arm64-android.cmake
similarity index 74%
rename from cmake/option/option_arm64-android.cmake
rename to cmake/buildtool/config/config_arm64-android.cmake
index 3ce2c81..037541c 100644 (file)
--- a/cmake/option/option_arm64-android.cmake
+++ b/cmake/buildtool/config/config_arm64-android.cmake
@@ -1,4 +1,4 @@
-include("cmake/option/option_linux.cmake")
+include("cmake/buildtool/config/config_linux.cmake")
 
 # On Android, pthread is contained in bionic(libc)
 set(LIB_PTHREAD "")

diff --git a/cmake/option/option_armv7l-linux.cmake b/cmake/buildtool/config/config_armv7l-linux.cmake
similarity index 88%
rename from cmake/option/option_armv7l-linux.cmake
rename to cmake/buildtool/config/config_armv7l-linux.cmake
index d4505ce..50fb2d7 100644 (file)
--- a/cmake/option/option_armv7l-linux.cmake
+++ b/cmake/buildtool/config/config_armv7l-linux.cmake
@@ -5,7 +5,7 @@
 message(STATUS "Building for ARMv7l Linux")
 
 # include linux common
-include("cmake/option/option_linux.cmake")
+include("cmake/buildtool/config/config_linux.cmake")
 
 if(NOT EXISTS "${ROOTFS_ARM}/lib/arm-linux-gnueabihf")
   message(FATAL_ERROR "Please prepare RootFS for ARM")

diff --git a/cmake/option/option_armv7l-tizen.cmake b/cmake/buildtool/config/config_armv7l-tizen.cmake
similarity index 88%
rename from cmake/option/option_armv7l-tizen.cmake
rename to cmake/buildtool/config/config_armv7l-tizen.cmake
index 6040eb6..90b0317 100644 (file)
--- a/cmake/option/option_armv7l-tizen.cmake
+++ b/cmake/buildtool/config/config_armv7l-tizen.cmake
@@ -6,7 +6,7 @@ message(STATUS "Building for ARMv7l(softfp) Tizen")
 
 # TODO : add and use option_tizen if something uncommon comes up
 # include linux common
-include("cmake/option/option_linux.cmake")
+include("cmake/buildtool/config/config_linux.cmake")
 
 # TODO : support rootfs setting for tizen cross-build
 

diff --git a/cmake/option/option_linux.cmake b/cmake/buildtool/config/config_linux.cmake
similarity index 100%
rename from cmake/option/option_linux.cmake
rename to cmake/buildtool/config/config_linux.cmake

diff --git a/cmake/option/option_x86_64-linux.cmake b/cmake/buildtool/config/config_x86_64-linux.cmake
similarity index 76%
rename from cmake/option/option_x86_64-linux.cmake
rename to cmake/buildtool/config/config_x86_64-linux.cmake
index 6f4d0eb..528e483 100644 (file)
--- a/cmake/option/option_x86_64-linux.cmake
+++ b/cmake/buildtool/config/config_x86_64-linux.cmake
@@ -4,7 +4,7 @@
 message(STATUS "Building for x86-64 Linux")
 
 # include linux common
-include("cmake/option/option_linux.cmake")
+include("cmake/buildtool/config/config_linux.cmake")
 
 # SIMD for x86
 set(FLAGS_COMMON ${FLAGS_COMMON}