mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-26 06:04:47 +00:00
[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
This commit is contained in:
parent
97b74f7a69
commit
746ef5229c
@ -20,12 +20,6 @@ if (POLICY CMP0051)
|
||||
cmake_policy(SET CMP0051 OLD)
|
||||
endif()
|
||||
|
||||
if(CMAKE_VERSION VERSION_LESS 3.1.20141117)
|
||||
set(cmake_3_2_USES_TERMINAL)
|
||||
else()
|
||||
set(cmake_3_2_USES_TERMINAL USES_TERMINAL)
|
||||
endif()
|
||||
|
||||
if(NOT DEFINED LLVM_VERSION_MAJOR)
|
||||
set(LLVM_VERSION_MAJOR 3)
|
||||
endif()
|
||||
|
@ -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}
|
||||
|
@ -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()
|
||||
|
@ -69,7 +69,7 @@ add_custom_target(install-xcode-toolchain
|
||||
COMMAND "${CMAKE_COMMAND}"
|
||||
-DCMAKE_INSTALL_PREFIX=${LLVMToolchainDir}/usr/
|
||||
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
|
||||
${cmake_3_2_USES_TERMINAL})
|
||||
USES_TERMINAL)
|
||||
|
||||
if(LLVM_DISTRIBUTION_COMPONENTS)
|
||||
if(CMAKE_CONFIGURATION_TYPES)
|
||||
@ -86,7 +86,7 @@ if(LLVM_DISTRIBUTION_COMPONENTS)
|
||||
-DCMAKE_INSTALL_COMPONENT=${target}
|
||||
-DCMAKE_INSTALL_PREFIX=${LLVMToolchainDir}/usr/
|
||||
-P "${CMAKE_BINARY_DIR}/cmake_install.cmake"
|
||||
${cmake_3_2_USES_TERMINAL})
|
||||
USES_TERMINAL)
|
||||
add_dependencies(install-distribution-toolchain install-distribution-${target})
|
||||
endforeach()
|
||||
endif()
|
||||
|
Loading…
x
Reference in New Issue
Block a user