diff options
author | Chris Bieneman <beanz@apple.com> | 2016-06-09 22:41:36 +0000 |
---|---|---|
committer | Chris Bieneman <beanz@apple.com> | 2016-06-09 22:41:36 +0000 |
commit | 22f7a63da6173bc1c162aafef690156a94b0f1eb (patch) | |
tree | 935f7d59b7fb69a29cbba5ea8adfea5a56a3e35f /cmake | |
parent | f8bdcad7beb6d82f422dd5c45f7fbbeb1f4eac85 (diff) |
[CMake] Cleanup ExternalProject usage of CMake 3.x features
All the ExternalProject features in use here are supported by CMake 3.4.3, so we don't need these version checks anymore.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@272327 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/modules/LLVMExternalProjectUtils.cmake | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/cmake/modules/LLVMExternalProjectUtils.cmake b/cmake/modules/LLVMExternalProjectUtils.cmake index bf1b152b275..2b77ff3bcdf 100644 --- a/cmake/modules/LLVMExternalProjectUtils.cmake +++ b/cmake/modules/LLVMExternalProjectUtils.cmake @@ -61,20 +61,6 @@ function(llvm_ExternalProject_Add name source_dir) list(APPEND TOOLCHAIN_BINS ${RUNTIME_LIBRARIES}) endif() - if(CMAKE_VERSION VERSION_GREATER 3.1.0) - set(cmake_3_1_EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL 1) - set(cmake_3_1_BUILD_ALWAYS BUILD_ALWAYS 1) - endif() - - if(CMAKE_VERSION VERSION_GREATER 3.3.20150708) - set(cmake_3_4_USES_TERMINAL_OPTIONS - USES_TERMINAL_CONFIGURE 1 - USES_TERMINAL_BUILD 1 - USES_TERMINAL_INSTALL 1 - ) - set(cmake_3_4_USES_TERMINAL USES_TERMINAL 1) - endif() - set(STAMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/${name}-stamps/) set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${name}-bins/) @@ -117,7 +103,7 @@ function(llvm_ExternalProject_Add name source_dir) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp) if(ARG_EXCLUDE_FROM_ALL) - set(exclude ${cmake_3_1_EXCLUDE_FROM_ALL}) + set(exclude EXCLUDE_FROM_ALL 1) endif() ExternalProject_Add(${name} @@ -135,8 +121,10 @@ function(llvm_ExternalProject_Add name source_dir) ${PASSTHROUGH_VARIABLES} INSTALL_COMMAND "" STEP_TARGETS configure build - ${cmake_3_1_BUILD_ALWAYS} - ${cmake_3_4_USES_TERMINAL_OPTIONS} + BUILD_ALWAYS 1 + USES_TERMINAL_CONFIGURE 1 + USES_TERMINAL_BUILD 1 + USES_TERMINAL_INSTALL 1 ) if(CMAKE_VERSION VERSION_LESS 3.1.0) @@ -150,7 +138,7 @@ function(llvm_ExternalProject_Add name source_dir) COMMENT "Forcing rebuild of ${name}" DEPENDEES configure clean DEPENDS ${ALWAYS_REBUILD} ${ARG_DEPENDS} ${TOOLCHAIN_BINS} - ${cmake_3_4_USES_TERMINAL} ) + USES_TERMINAL 1 ) endif() if(ARG_USE_TOOLCHAIN) @@ -164,7 +152,7 @@ function(llvm_ExternalProject_Add name source_dir) DEPENDEES configure ${force_deps} WORKING_DIRECTORY ${BINARY_DIR} - ${cmake_3_4_USES_TERMINAL} + USES_TERMINAL 1 ) ExternalProject_Add_StepTargets(${name} clean) |