File tree Expand file tree Collapse file tree 4 files changed +6
-16
lines changed
Expand file tree Collapse file tree 4 files changed +6
-16
lines changed Original file line number Diff line number Diff line change @@ -20,12 +20,6 @@ if (POLICY CMP0051)
2020 cmake_policy (SET CMP0051 OLD)
2121endif ()
2222
23- if (CMAKE_VERSION VERSION_LESS 3.1.20141117)
24- set (cmake_3_2_USES_TERMINAL)
25- else ()
26- set (cmake_3_2_USES_TERMINAL USES_TERMINAL )
27- endif ()
28-
2923if (NOT DEFINED LLVM_VERSION_MAJOR)
3024 set (LLVM_VERSION_MAJOR 3)
3125endif ()
Original file line number Diff line number Diff line change @@ -1079,7 +1079,7 @@ function(add_lit_target target comment)
10791079 add_custom_target (${target}
10801080 COMMAND ${LIT_COMMAND} ${ARG_UNPARSED_ARGUMENTS}
10811081 COMMENT "${comment} "
1082- ${cmake_3_2_USES_TERMINAL}
1082+ USES_TERMINAL
10831083 )
10841084 else ()
10851085 add_custom_target (${target}
Original file line number Diff line number Diff line change @@ -75,18 +75,14 @@ function(llvm_ExternalProject_Add name source_dir)
7575 set (cmake_3_4_USES_TERMINAL USES_TERMINAL 1)
7676 endif ()
7777
78- if (CMAKE_VERSION VERSION_GREATER 3.1.20141116)
79- set (cmake_3_2_USES_TERMINAL USES_TERMINAL )
80- endif ()
81-
8278 set (STAMP_DIR ${CMAKE_CURRENT_BINARY_DIR} /${name} -stamps/)
8379 set (BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} /${name} -bins/)
8480
8581 add_custom_target (${name} -clear
8682 COMMAND ${CMAKE_COMMAND} -E remove_directory ${BINARY_DIR}
8783 COMMAND ${CMAKE_COMMAND} -E remove_directory ${STAMP_DIR}
8884 COMMENT "Clobbering ${name} build and stamp directories"
89- ${cmake_3_2_USES_TERMINAL}
85+ USES_TERMINAL
9086 )
9187
9288 # Find all variables that start with COMPILER_RT and populate a variable with
@@ -187,7 +183,7 @@ function(llvm_ExternalProject_Add name source_dir)
187183 COMMAND "${CMAKE_COMMAND} "
188184 -DCMAKE_INSTALL_COMPONENT=${name}
189185 -P "${CMAKE_BINARY_DIR} /cmake_install.cmake"
190- ${cmake_3_2_USES_TERMINAL} )
186+ USES_TERMINAL )
191187 endif ()
192188
193189 # Add top-level targets
@@ -198,6 +194,6 @@ function(llvm_ExternalProject_Add name source_dir)
198194 DEPENDS ${name} -configure
199195 WORKING_DIRECTORY ${BINARY_DIR}
200196 VERBATIM
201- ${cmake_3_2_USES_TERMINAL} )
197+ USES_TERMINAL )
202198 endforeach ()
203199endfunction ()
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ add_custom_target(install-xcode-toolchain
6969 COMMAND "${CMAKE_COMMAND} "
7070 -DCMAKE_INSTALL_PREFIX=${LLVMToolchainDir} /usr/
7171 -P "${CMAKE_BINARY_DIR} /cmake_install.cmake"
72- ${cmake_3_2_USES_TERMINAL} )
72+ USES_TERMINAL )
7373
7474if (LLVM_DISTRIBUTION_COMPONENTS)
7575 if (CMAKE_CONFIGURATION_TYPES )
@@ -86,7 +86,7 @@ if(LLVM_DISTRIBUTION_COMPONENTS)
8686 -DCMAKE_INSTALL_COMPONENT=${target}
8787 -DCMAKE_INSTALL_PREFIX=${LLVMToolchainDir} /usr/
8888 -P "${CMAKE_BINARY_DIR} /cmake_install.cmake"
89- ${cmake_3_2_USES_TERMINAL} )
89+ USES_TERMINAL )
9090 add_dependencies (install -distribution-toolchain install -distribution-${target} )
9191 endforeach ()
9292endif ()
You can’t perform that action at this time.
0 commit comments