diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-15 14:26:10 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-15 14:26:10 (GMT) |
| commit | 06209c4ce2d75d2e7eff16312d570b7f411e413e (patch) | |
| tree | 234b0f2384898619bb5e1a35124fe127ea915e7d | |
| parent | dadccc752e5e78944af89999112c9a7f8444ffbf (diff) | |
| parent | 4deaa25f46bbe021648d837a936be64117922157 (diff) | |
| download | CMake-06209c4ce2d75d2e7eff16312d570b7f411e413e.zip CMake-06209c4ce2d75d2e7eff16312d570b7f411e413e.tar.gz CMake-06209c4ce2d75d2e7eff16312d570b7f411e413e.tar.bz2 | |
Merge topic 'ExternalProject-fix-UPDATE_DISCONNECTED'
4deaa25f ExternalProject: Fix UPDATE_DISCONNECTED with empty update steps
| -rw-r--r-- | Modules/ExternalProject.cmake | 4 | ||||
| -rw-r--r-- | Tests/ExternalProjectLocal/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 1ba4a8f..b15b3f7 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -2165,12 +2165,12 @@ Update to Mercurial >= 2.1.1. ${uses_terminal} ) - if(always AND update_disconnected) + if(update_disconnected) _ep_get_step_stampfile(${name} skip-update skip-update_stamp_file) string(REPLACE "Performing" "Skipping" comment "${comment}") ExternalProject_Add_Step(${name} skip-update COMMENT ${comment} - ALWAYS 1 + ALWAYS ${always} EXCLUDE_FROM_MAIN 1 WORKING_DIRECTORY ${work_dir} DEPENDEES download diff --git a/Tests/ExternalProjectLocal/CMakeLists.txt b/Tests/ExternalProjectLocal/CMakeLists.txt index 17f1630..5b94163 100644 --- a/Tests/ExternalProjectLocal/CMakeLists.txt +++ b/Tests/ExternalProjectLocal/CMakeLists.txt @@ -131,6 +131,7 @@ ExternalProject_Add(${proj} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -G ${CMAKE_GENERATOR} <SOURCE_DIR> INSTALL_COMMAND "" LOG_BUILD 1 + UPDATE_DISCONNECTED 1 ) set_property(TARGET ${proj} PROPERTY FOLDER "Local/TGZ") |