From 3c98bd998000c2ec0fc3af5c3de4f461e0ac4277 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=EB=B0=95=EC=84=B8=ED=9D=AC/=EB=8F=99=EC=9E=91=EC=A0=9C?=
 =?utf8?q?=EC=96=B4Lab=28SR=29/Principal=20Engineer/=EC=82=BC=EC=84=B1?=
 =?utf8?q?=EC=A0=84=EC=9E=90?= <saehie.park@samsung.com>
Date: Tue, 20 Mar 2018 09:45:53 +0900
Subject: [PATCH] Change cmake option to be form of arch-os (#85)

This will rename cmake option files to form of arch-os so to support Tizen
---
 CMakeLists.txt                                                         | 3 +--
 .../{arch/arm/option_armv7l.cmake => option/option_armv7l-linux.cmake} | 3 +++
 cmake/{os/linux/option.cmake => option/option_linux.cmake}             | 0
 .../x86_64/option_x86_64.cmake => option/option_x86_64-linux.cmake}    | 3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)
 rename cmake/{arch/arm/option_armv7l.cmake => option/option_armv7l-linux.cmake} (85%)
 rename cmake/{os/linux/option.cmake => option/option_linux.cmake} (100%)
 rename cmake/{arch/x86_64/option_x86_64.cmake => option/option_x86_64-linux.cmake} (68%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8b534a..4454dae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,8 +51,7 @@ set(HOST_PLATFORM "${HOST_ARCH}-${HOST_OS}")
 set(TARGET_PLATFORM "${TARGET_ARCH}-${TARGET_OS}")
 
 # platform specific options
-include("cmake/os/${TARGET_OS}/option.cmake")
-include("cmake/arch/${TARGET_ARCH_BASE}/option_${TARGET_ARCH}.cmake")
+include("cmake/option/option_${TARGET_PLATFORM}.cmake")
 
 # add common flags
 foreach(FLAG ${FLAGS_COMMON})
diff --git a/cmake/arch/arm/option_armv7l.cmake b/cmake/option/option_armv7l-linux.cmake
similarity index 85%
rename from cmake/arch/arm/option_armv7l.cmake
rename to cmake/option/option_armv7l-linux.cmake
index 79e781e..d4505ce 100644
--- a/cmake/arch/arm/option_armv7l.cmake
+++ b/cmake/option/option_armv7l-linux.cmake
@@ -4,6 +4,9 @@
 
 message(STATUS "Building for ARMv7l Linux")
 
+# include linux common
+include("cmake/option/option_linux.cmake")
+
 if(NOT EXISTS "${ROOTFS_ARM}/lib/arm-linux-gnueabihf")
   message(FATAL_ERROR "Please prepare RootFS for ARM")
 endif()
diff --git a/cmake/os/linux/option.cmake b/cmake/option/option_linux.cmake
similarity index 100%
rename from cmake/os/linux/option.cmake
rename to cmake/option/option_linux.cmake
diff --git a/cmake/arch/x86_64/option_x86_64.cmake b/cmake/option/option_x86_64-linux.cmake
similarity index 68%
rename from cmake/arch/x86_64/option_x86_64.cmake
rename to cmake/option/option_x86_64-linux.cmake
index 89c617d..6f4d0eb 100644
--- a/cmake/arch/x86_64/option_x86_64.cmake
+++ b/cmake/option/option_x86_64-linux.cmake
@@ -3,6 +3,9 @@
 #
 message(STATUS "Building for x86-64 Linux")
 
+# include linux common
+include("cmake/option/option_linux.cmake")
+
 # SIMD for x86
 set(FLAGS_COMMON ${FLAGS_COMMON}
     "-msse4"
-- 
2.7.4