[llvm] r272211 - [CMake] Cleanup uses of USES_TERMINAL

[Chris Bieneman via llvm-commits]

Author: cbieneman
Date: Wed Jun  8 17:19:25 2016
New Revision: 272211

URL: http://llvm.org/viewvc/llvm-project?rev=272211&view=rev
Log:
[CMake] Cleanup uses of USES_TERMINAL

Now that we are on CMake 3.4.3 we no longer need a version check around this.

Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/cmake/modules/AddLLVM.cmake
    llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake
    llvm/trunk/tools/xcode-toolchain/CMakeLists.txt

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=272211&r1=272210&r2=272211&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Wed Jun  8 17:19:25 2016
@@ -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()

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=272211&r1=272210&r2=272211&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Wed Jun  8 17:19:25 2016
@@ -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}

Modified: llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake?rev=272211&r1=272210&r2=272211&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake (original)
+++ llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake Wed Jun  8 17:19:25 2016
@@ -75,10 +75,6 @@ function(llvm_ExternalProject_Add name s
     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 s
     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 s
                       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 s
       DEPENDS ${name}-configure
       WORKING_DIRECTORY ${BINARY_DIR}
       VERBATIM
-      ${cmake_3_2_USES_TERMINAL})
+      USES_TERMINAL)
   endforeach()
 endfunction()

Modified: llvm/trunk/tools/xcode-toolchain/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/xcode-toolchain/CMakeLists.txt?rev=272211&r1=272210&r2=272211&view=diff
==============================================================================
--- llvm/trunk/tools/xcode-toolchain/CMakeLists.txt (original)
+++ llvm/trunk/tools/xcode-toolchain/CMakeLists.txt Wed Jun  8 17:19:25 2016
@@ -69,7 +69,7 @@ add_custom_target(install-xcode-toolchai
                   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()