[llvm] r272327 - [CMake] Cleanup ExternalProject usage of CMake 3.x features

[Chris Bieneman via llvm-commits]

Author: cbieneman
Date: Thu Jun  9 17:41:36 2016
New Revision: 272327

URL: http://llvm.org/viewvc/llvm-project?rev=272327&view=rev
Log:
[CMake] Cleanup ExternalProject usage of CMake 3.x features

All the ExternalProject features in use here are supported by CMake 3.4.3, so we don't need these version checks anymore.

Modified:
    llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake

Modified: llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake?rev=272327&r1=272326&r2=272327&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake (original)
+++ llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake Thu Jun  9 17:41:36 2016
@@ -61,20 +61,6 @@ function(llvm_ExternalProject_Add name s
     list(APPEND TOOLCHAIN_BINS ${RUNTIME_LIBRARIES})
   endif()
 
-  if(CMAKE_VERSION VERSION_GREATER 3.1.0)
-    set(cmake_3_1_EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL 1)
-    set(cmake_3_1_BUILD_ALWAYS BUILD_ALWAYS 1)
-  endif()
-
-  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
-      )
-    set(cmake_3_4_USES_TERMINAL USES_TERMINAL 1)
-  endif()
-
   set(STAMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/${name}-stamps/)
   set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${name}-bins/)
 
@@ -117,7 +103,7 @@ function(llvm_ExternalProject_Add name s
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp)
 
   if(ARG_EXCLUDE_FROM_ALL)
-    set(exclude ${cmake_3_1_EXCLUDE_FROM_ALL})
+    set(exclude EXCLUDE_FROM_ALL 1)
   endif()
 
   ExternalProject_Add(${name}
@@ -135,8 +121,10 @@ function(llvm_ExternalProject_Add name s
                ${PASSTHROUGH_VARIABLES}
     INSTALL_COMMAND ""
     STEP_TARGETS configure build
-    ${cmake_3_1_BUILD_ALWAYS}
-    ${cmake_3_4_USES_TERMINAL_OPTIONS}
+    BUILD_ALWAYS 1
+    USES_TERMINAL_CONFIGURE 1
+    USES_TERMINAL_BUILD 1
+    USES_TERMINAL_INSTALL 1
     )
 
   if(CMAKE_VERSION VERSION_LESS 3.1.0)
@@ -150,7 +138,7 @@ function(llvm_ExternalProject_Add name s
       COMMENT "Forcing rebuild of ${name}"
       DEPENDEES configure clean
       DEPENDS ${ALWAYS_REBUILD} ${ARG_DEPENDS} ${TOOLCHAIN_BINS}
-      ${cmake_3_4_USES_TERMINAL} )
+      USES_TERMINAL 1 )
   endif()
 
   if(ARG_USE_TOOLCHAIN)
@@ -164,7 +152,7 @@ function(llvm_ExternalProject_Add name s
     DEPENDEES configure
     ${force_deps}
     WORKING_DIRECTORY ${BINARY_DIR}
-    ${cmake_3_4_USES_TERMINAL}
+    USES_TERMINAL 1
     )
   ExternalProject_Add_StepTargets(${name} clean)