summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-02-24 15:40:07 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-02-24 15:40:07 (GMT)
commit624b0fa923ef669649300e923931730d0bd03ba7 (patch)
treeaa92bddcd47cad1a94dca414d0432cebf17b4942 /Modules
parent461eaee53ecc1bd8c4239ff2e25fd85f0a5fc126 (diff)
parent73e5c6aead4d2c748ced061a7de27f2ffc7e2d31 (diff)
downloadCMake-624b0fa923ef669649300e923931730d0bd03ba7.zip
CMake-624b0fa923ef669649300e923931730d0bd03ba7.tar.gz
CMake-624b0fa923ef669649300e923931730d0bd03ba7.tar.bz2
Merge topic 'ExternalProject-BUILD_ALWAYS'
73e5c6ae ExternalProject: Add option to always run the build step
Diffstat (limited to 'Modules')
-rw-r--r--Modules/ExternalProject.cmake9
1 files changed, 9 insertions, 0 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 0df51a8..1e83163 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -54,6 +54,7 @@
# [BINARY_DIR dir] # Specify build dir location
# [BUILD_COMMAND cmd...] # Command to drive the native build
# [BUILD_IN_SOURCE 1] # Use source dir for build dir
+# [BUILD_ALWAYS 1] # No stamp file, build step always runs
# #--Install step---------------
# [INSTALL_DIR dir] # Installation prefix
# [INSTALL_COMMAND cmd...] # Command to drive install after build
@@ -1716,10 +1717,18 @@ function(_ep_add_build_command name)
set(log "")
endif()
+ get_property(build_always TARGET ${name} PROPERTY _EP_BUILD_ALWAYS)
+ if(build_always)
+ set(always 1)
+ else()
+ set(always 0)
+ endif()
+
ExternalProject_Add_Step(${name} build
COMMAND ${cmd}
WORKING_DIRECTORY ${binary_dir}
DEPENDEES configure
+ ALWAYS ${always}
${log}
)
endfunction()