diff options
| author | Chris Bieneman <beanz@apple.com> | 2015-08-05 20:46:39 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2015-08-05 20:46:39 +0000 |
| commit | 936ff96fae94777417573d487ce9f994c7f4b2ea (patch) | |
| tree | 8c3a3905396e3aa08b2c2eb719ba2568f3d518fd /clang | |
| parent | 670d1229c4adb13acbae7e3324319d1ed26ed32b (diff) | |
| download | bcm5719-llvm-936ff96fae94777417573d487ce9f994c7f4b2ea.tar.gz bcm5719-llvm-936ff96fae94777417573d487ce9f994c7f4b2ea.zip | |
[CMake] Add USES_TERMINAL 1 to ExternalProject_Add_Step calls on 3.3.20150708 and later.
llvm-svn: 244119
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index f0002ac1af9..250d66eb16e 100644 --- a/clang/CMakeLists.txt +++ b/clang/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 <BINARY_DIR> --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 <BINARY_DIR> --target ${target} COMMENT "Performing ${target} for 'bootstrap'" DEPENDEES configure + ${cmake_3_4_USES_TERMINAL} ) ExternalProject_Add_StepTargets(bootstrap ${target}) endforeach() |
