summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-08-31 18:36:50 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2010-08-31 18:36:50 (GMT)
commit1976c45a3c65534966d51b6e2f1d460081bb49b5 (patch)
tree5cd14bf293e95332657288e73a81fdddf389746a /Tests
parentd2a65b5f40d8be6710d0ca815e6a5863885db749 (diff)
parentadb58d5e36e482e7cc2c0b1a37d94b21da9234df (diff)
downloadCMake-1976c45a3c65534966d51b6e2f1d460081bb49b5.zip
CMake-1976c45a3c65534966d51b6e2f1d460081bb49b5.tar.gz
CMake-1976c45a3c65534966d51b6e2f1d460081bb49b5.tar.bz2
Merge topic 'intra-component-dependencies'
adb58d5 Honor strong intra-component target dependencies 681cf01 Distinguish "strong" and "weak" target dependency edges 7be2617 Split notion of node lists and edge lists
Diffstat (limited to 'Tests')
-rw-r--r--Tests/Dependency/Four/CMakeLists.txt3
-rw-r--r--Tests/Dependency/Four/FourSrc.c1
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();