Remove deprecated cmake variables (#4913)
author오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>
Wed, 3 Apr 2019 06:49:29 +0000 (15:49 +0900)
committer박세희/On-Device Lab(SR)/Principal Engineer/삼성전자 <saehie.park@samsung.com>
Wed, 3 Apr 2019 06:49:29 +0000 (15:49 +0900)
Remove deprecated cmake variables:  TARGET_IS_ARMARCH, BUILD_IS_NATIVE
Update comment about variable setting

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
CMakeLists.txt
Makefile
cmake/modules/IdentifyPlatform.cmake

index d0e9ed9..a8edacf 100644 (file)
@@ -39,10 +39,8 @@ include("cmake/ApplyCompileFlags.cmake")
 # Configuration flags
 include("cmake/CfgOptionFlags.cmake")
 # and besides CfgOptionFlags.cmake that can be given outside
-#   OBS_BUILD: build boolean flag that tizen in OBS build
 #   COVERAGE_BUILD: build boolean flag that enables converage test
-#   ROOTFS_ARM: arm rootfs path for cross building
-#   ROOTFS_ARM64: arm 64bit rootfs path for cross building, linux,tizen,android
+#   ROOTFS_DIR: rootfs path for cross building
 #   TARGET_ARCH: target architecture string for cross building
 #   TARGET_OS: target os string for cross building
 
index 9fded63..0f9c16b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,6 @@ endif
 ifeq ($(CROSS_BUILD),1)
        TOOLCHAIN_FILE=cmake/buildtool/cross/toolchain_$(TARGET_ARCH_LC)-$(TARGET_OS).cmake
        OPTIONS+= -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE)
-       OPTIONS+= -DCROSS_BUILD=ON
 endif
 
 ifeq ($(COVERAGE_BUILD),1)
index 7d53a6a..9313eef 100644 (file)
@@ -28,12 +28,8 @@ else()
   message(FATAL_ERROR "'${HOST_ARCH}' architecture is not supported")
 endif()
 
-# TARGET_IS_ARMARCH: for workaround arm-related build option setting
-# TODO Remove TARGET_IS_ARMARCH
-set(TARGET_IS_ARMARCH TRUE)
 if("${TARGET_ARCH}" STREQUAL "x86_64")
   set(TARGET_ARCH_BASE ${TARGET_ARCH})
-  set(TARGET_IS_ARMARCH FALSE)
 elseif("${TARGET_ARCH}" STREQUAL "armv7l")
   set(TARGET_ARCH_BASE "arm")
 elseif("${TARGET_ARCH}" STREQUAL "arm64")
@@ -44,12 +40,6 @@ else()
   message(FATAL_ERROR "'${TARGET_ARCH}' architecture is not supported")
 endif()
 
-if(NOT CROSS_BUILD)
-  set(BUILD_IS_NATIVE True)
-else()
-  set(BUILD_IS_NATIVE False)
-endif()
-
 # host & target platform name
 set(HOST_PLATFORM "${HOST_ARCH}-${HOST_OS}")
 set(TARGET_PLATFORM "${TARGET_ARCH}-${TARGET_OS}")