diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-06-09 22:38:42 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-06-09 22:38:42 +0000 |
| commit | fe0b2ebbdc8a124a71e551a3b1db03f2fa5548ce (patch) | |
| tree | f6b3c64e130bc87f60d44fdc12a0b7a031cd2ad2 /runtime | |
| parent | f5a39c169254a1e1830e7098fa92e0866259a388 (diff) | |
[CMake] Cleaning up CMake version checks in ExternalProject calls
Now that we're on CMake 3.4.3 all the ExternalProject features we use are supported everywhere, so we don't need the version checks anymore.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@272324 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/CMakeLists.txt | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index a8242324b6..9e58ec19a0 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -34,13 +34,6 @@ if(NOT EXISTS ${COMPILER_RT_SRC_ROOT}) endif() if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) - 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 - ) - endif() # Add compiler-rt as an external project. set(COMPILER_RT_PREFIX ${CMAKE_BINARY_DIR}/projects/compiler-rt) @@ -86,7 +79,9 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) ${COMPILER_RT_PASSTHROUGH_VARIABLES} INSTALL_COMMAND "" STEP_TARGETS configure build - ${cmake_3_4_USES_TERMINAL_OPTIONS} + USES_TERMINAL_CONFIGURE 1 + USES_TERMINAL_BUILD 1 + USES_TERMINAL_INSTALL 1 ) get_ext_project_build_command(run_clean_compiler_rt clean) |