[llvm] r222181 - CMake: Use the new USES_TERMINAL option for test suite targets when available.

Peter Collingbourne peter at pcc.me.uk
Mon Nov 17 14:16:15 PST 2014


Author: pcc
Date: Mon Nov 17 16:16:15 2014
New Revision: 222181

URL: http://llvm.org/viewvc/llvm-project?rev=222181&view=rev
Log:
CMake: Use the new USES_TERMINAL option for test suite targets when available.

Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/cmake/modules/AddLLVM.cmake

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=222181&r1=222180&r2=222181&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Mon Nov 17 16:16:15 2014
@@ -16,6 +16,12 @@ else()
   endif()
 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()
+
 project(LLVM)
 
 # Add path for custom modules

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=222181&r1=222180&r2=222181&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Mon Nov 17 16:16:15 2014
@@ -679,6 +679,7 @@ function(add_lit_target target comment)
     add_custom_target(${target}
       COMMAND ${LIT_COMMAND} ${ARG_DEFAULT_ARGS}
       COMMENT "${comment}"
+      ${cmake_3_2_USES_TERMINAL}
       )
     add_dependencies(${target} ${ARG_DEPENDS})
   else()





More information about the llvm-commits mailing list