diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-06 19:13:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-11-06 19:13:58 (GMT) |
| commit | 3be0a7b4bf22d8b13b53070b8ec40755033f8237 (patch) | |
| tree | c12c31e0d8db2ec587e378984b6d5e178bc37e1d /Tests | |
| parent | 93a324975cb26ba05481e422f5e3e5abc72c8d3b (diff) | |
| parent | 05f162ce9571d1ec7dee6f4c4b76126526247b14 (diff) | |
| download | CMake-3be0a7b4bf22d8b13b53070b8ec40755033f8237.zip CMake-3be0a7b4bf22d8b13b53070b8ec40755033f8237.tar.gz CMake-3be0a7b4bf22d8b13b53070b8ec40755033f8237.tar.bz2 | |
Merge topic 'FixImplicitDepends2'
05f162c AddCustomCommand: Handle multiple IMPLICIT_DEPENDS files (#10048)
c66f03a cmDepends: No dependency-vector erasure in CheckDependencies
e74ff7c cmDepends: allow multiple dependees per depender
ecc77d0 cmDependsC: fix indentation
3e7d97d cmDependsC: remove code duplication
b4e8f49 cmDependsC: remove unused member variable
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/BuildDepends/Project/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/BuildDepends/Project/dep_custom2.cxx | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt index 01f5f62..542c716 100644 --- a/Tests/BuildDepends/Project/CMakeLists.txt +++ b/Tests/BuildDepends/Project/CMakeLists.txt @@ -64,7 +64,8 @@ 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) + IMPLICIT_DEPENDS CXX ${CMAKE_CURRENT_SOURCE_DIR}/dep_custom.cxx + CXX ${CMAKE_CURRENT_SOURCE_DIR}/dep_custom2.cxx ) else() # No IMPLICIT_DEPENDS...just depend directly. set(ZOT_DEPENDS DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/zot.hxx.in) diff --git a/Tests/BuildDepends/Project/dep_custom2.cxx b/Tests/BuildDepends/Project/dep_custom2.cxx new file mode 100644 index 0000000..ac9dee1 --- /dev/null +++ b/Tests/BuildDepends/Project/dep_custom2.cxx @@ -0,0 +1,2 @@ +#include <zot_custom.hxx.in> +// some comment |