diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-06-08 22:19:25 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-06-08 22:19:25 +0000 |
| commit | df04e79f35ba669adba3c43c8b3322a9218d5b92 (patch) | |
| tree | da35a6c52885086e585e920f742ac4e38e5a1fe8 /llvm/cmake | |
| parent | 334064577150c09679fcc412f5e8e7f8370fce96 (diff) | |
| download | bcm5719-llvm-df04e79f35ba669adba3c43c8b3322a9218d5b92.tar.gz bcm5719-llvm-df04e79f35ba669adba3c43c8b3322a9218d5b92.zip | |
[CMake] Cleanup uses of USES_TERMINAL
Now that we are on CMake 3.4.3 we no longer need a version check around this.
llvm-svn: 272211
Diffstat (limited to 'llvm/cmake')
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 2 | ||||
| -rw-r--r-- | llvm/cmake/modules/LLVMExternalProjectUtils.cmake | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 789555aee06..4668ddc78a8 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -1079,7 +1079,7 @@ function(add_lit_target target comment) add_custom_target(${target} COMMAND ${LIT_COMMAND} ${ARG_UNPARSED_ARGUMENTS} COMMENT "${comment}" - ${cmake_3_2_USES_TERMINAL} + USES_TERMINAL ) else() add_custom_target(${target} diff --git a/llvm/cmake/modules/LLVMExternalProjectUtils.cmake b/llvm/cmake/modules/LLVMExternalProjectUtils.cmake index 3bc39b680ce..bf1b152b275 100644 --- a/llvm/cmake/modules/LLVMExternalProjectUtils.cmake +++ b/llvm/cmake/modules/LLVMExternalProjectUtils.cmake @@ -75,10 +75,6 @@ function(llvm_ExternalProject_Add name source_dir) set(cmake_3_4_USES_TERMINAL USES_TERMINAL 1) endif() - if(CMAKE_VERSION VERSION_GREATER 3.1.20141116) - set(cmake_3_2_USES_TERMINAL USES_TERMINAL) - endif() - set(STAMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/${name}-stamps/) set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${name}-bins/) @@ -86,7 +82,7 @@ function(llvm_ExternalProject_Add name source_dir) COMMAND ${CMAKE_COMMAND} -E remove_directory ${BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E remove_directory ${STAMP_DIR} COMMENT "Clobbering ${name} build and stamp directories" - ${cmake_3_2_USES_TERMINAL} + USES_TERMINAL ) # Find all variables that start with COMPILER_RT and populate a variable with @@ -187,7 +183,7 @@ function(llvm_ExternalProject_Add name source_dir) COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=${name} -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" - ${cmake_3_2_USES_TERMINAL}) + USES_TERMINAL) endif() # Add top-level targets @@ -198,6 +194,6 @@ function(llvm_ExternalProject_Add name source_dir) DEPENDS ${name}-configure WORKING_DIRECTORY ${BINARY_DIR} VERBATIM - ${cmake_3_2_USES_TERMINAL}) + USES_TERMINAL) endforeach() endfunction() |
