diff options
| author | Brad King <brad.king@kitware.com> | 2007-12-21 17:22:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-12-21 17:22:12 (GMT) |
| commit | d83b4cd255bcd13b5b7e4279a6e3e959fcb58688 (patch) | |
| tree | 1987a83567e98da043994e7fa870fe48c7b08c8a /Tests/BuildDepends/Project | |
| parent | 6586149d64be27694652b40bfbcc4d19f6c2c5eb (diff) | |
| download | CMake-d83b4cd255bcd13b5b7e4279a6e3e959fcb58688.zip CMake-d83b4cd255bcd13b5b7e4279a6e3e959fcb58688.tar.gz CMake-d83b4cd255bcd13b5b7e4279a6e3e959fcb58688.tar.bz2 | |
ENH: Add a depends check step to custom targets. Add support for the IMPLICIT_DEPENDS feature of custom commands when building in custom targets. Convert multiple-output pair checks to be per-target instead of global.
Diffstat (limited to 'Tests/BuildDepends/Project')
| -rw-r--r-- | Tests/BuildDepends/Project/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | Tests/BuildDepends/Project/dep_custom.cxx | 1 | ||||
| -rw-r--r-- | Tests/BuildDepends/Project/zot.cxx | 3 |
3 files changed, 17 insertions, 1 deletions
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt index 2651adf..01bbf44 100644 --- a/Tests/BuildDepends/Project/CMakeLists.txt +++ b/Tests/BuildDepends/Project/CMakeLists.txt @@ -32,9 +32,12 @@ add_executable(bar bar.cxx IF("${CMAKE_GENERATOR}" MATCHES "Make") # Test the IMPLICIT_DEPENDS feature. SET(ZOT_DEPENDS IMPLICIT_DEPENDS CXX ${CMAKE_CURRENT_SOURCE_DIR}/dep.cxx) + SET(ZOT_CUSTOM_DEP + IMPLICIT_DEPENDS CXX ${CMAKE_CURRENT_SOURCE_DIR}/dep_custom.cxx) ELSE("${CMAKE_GENERATOR}" MATCHES "Make") # No IMPLICIT_DEPENDS...just depend directly. SET(ZOT_DEPENDS DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/zot.hxx.in) + SET(ZOT_CUSTOM_DEP DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/zot_custom.hxx.in) ENDIF("${CMAKE_GENERATOR}" MATCHES "Make") add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zot.hxx @@ -44,4 +47,15 @@ add_custom_command( ${ZOT_DEPENDS} ) +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zot_custom.hxx + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_BINARY_DIR}/zot_custom.hxx.in + ${CMAKE_CURRENT_BINARY_DIR}/zot_custom.hxx + ${ZOT_CUSTOM_DEP} + ) +add_custom_target(zot_custom ALL DEPENDS + ${CMAKE_CURRENT_BINARY_DIR}/zot_custom.hxx) + add_executable(zot zot.cxx ${CMAKE_CURRENT_BINARY_DIR}/zot.hxx) +add_dependencies(zot zot_custom) diff --git a/Tests/BuildDepends/Project/dep_custom.cxx b/Tests/BuildDepends/Project/dep_custom.cxx new file mode 100644 index 0000000..b6ac548 --- /dev/null +++ b/Tests/BuildDepends/Project/dep_custom.cxx @@ -0,0 +1 @@ +#include <zot_custom.hxx.in> diff --git a/Tests/BuildDepends/Project/zot.cxx b/Tests/BuildDepends/Project/zot.cxx index 703ca38..356b078 100644 --- a/Tests/BuildDepends/Project/zot.cxx +++ b/Tests/BuildDepends/Project/zot.cxx @@ -1,9 +1,10 @@ #include <zot.hxx> +#include <zot_custom.hxx> #include <stdio.h> int main() { - printf("%s\n", zot); + printf("[%s] [%s]\n", zot, zot_custom); fflush(stdout); return 0; } |