From 33e168b822e50a17c7863fb5655de75a6ae259db Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Wed, 5 Aug 2015 20:46:39 +0000 Subject: [PATCH] [CMake] Add USES_TERMINAL 1 to ExternalProject_Add_Step calls on 3.3.20150708 and later. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@244119 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f0002ac1af..250d66eb16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -558,12 +558,14 @@ if (CLANG_ENABLE_BOOTSTRAP) if(CMAKE_VERSION VERSION_LESS 3.3.20150708) set(cmake_3_4_USES_TERMINAL_OPTIONS) + set(cmake_3_4_USES_TERMINAL) else() 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}/bootstrap-stamps/) @@ -607,6 +609,7 @@ if (CLANG_ENABLE_BOOTSTRAP) COMMAND ${CMAKE_COMMAND} --build --target install COMMENT "Performing install step for 'bootstrap'" DEPENDEES build + ${cmake_3_4_USES_TERMINAL} ) ExternalProject_Add_StepTargets(bootstrap really-install) add_custom_target(bootstrap-install DEPENDS bootstrap-really-install) @@ -621,6 +624,7 @@ if (CLANG_ENABLE_BOOTSTRAP) COMMAND ${CMAKE_COMMAND} --build --target ${target} COMMENT "Performing ${target} for 'bootstrap'" DEPENDEES configure + ${cmake_3_4_USES_TERMINAL} ) ExternalProject_Add_StepTargets(bootstrap ${target}) endforeach() -- 2.40.0