replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[CMake] Add USES_TERMINAL 1 to ExternalProject_Add_Step calls on 3.3.20150708 and later. 

llvm-svn: 244119
This commit is contained in:
Chris Bieneman 2015-08-05 20:46:39 +00:00
parent 670d1229c4
commit 936ff96fae
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/CMakeLists.txt
View File

@ -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()