diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-17 15:31:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-12-17 15:31:19 (GMT) |
| commit | 9bcaff02ff066e9bdd69e3e1e3134aa65c53c121 (patch) | |
| tree | 2f46b8a3e84e07b51b20c70065c8a1c26ad47fd5 /Tests/Dependency | |
| parent | 544d0c37742a068fa07b265380315a25af3ae9f3 (diff) | |
| parent | 3d13502c986e43f070366d04891c8a3da05e2cb8 (diff) | |
| download | CMake-9bcaff02ff066e9bdd69e3e1e3134aa65c53c121.zip CMake-9bcaff02ff066e9bdd69e3e1e3134aa65c53c121.tar.gz CMake-9bcaff02ff066e9bdd69e3e1e3134aa65c53c121.tar.bz2 | |
Merge branch 'cmake-guiRememberAdvancedCheckbox' into dev/strict-mode
Conflicts:
Source/QtDialog/CMakeSetupDialog.cxx
Diffstat (limited to 'Tests/Dependency')
| -rw-r--r-- | Tests/Dependency/Four/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/Dependency/Four/FourSrc.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Tests/Dependency/Four/CMakeLists.txt b/Tests/Dependency/Four/CMakeLists.txt index ba3711f..df0f162 100644 --- a/Tests/Dependency/Four/CMakeLists.txt +++ b/Tests/Dependency/Four/CMakeLists.txt @@ -1,3 +1,6 @@ +INCLUDE_DIRECTORIES(${Dependency_BINARY_DIR}/Two) ADD_LIBRARY( Four FourSrc.c ) TARGET_LINK_LIBRARIES( Four One Two NoDepA ) +# TwoCustom must build before Four. +ADD_DEPENDENCIES(Four TwoCustom) diff --git a/Tests/Dependency/Four/FourSrc.c b/Tests/Dependency/Four/FourSrc.c index e8fefcd..23a66a4 100644 --- a/Tests/Dependency/Four/FourSrc.c +++ b/Tests/Dependency/Four/FourSrc.c @@ -1,3 +1,4 @@ +#include <two-test.h> /* Requires TwoCustom to be built first. */ void NoDepAFunction(); void OneFunction(); void TwoFunction(); |