diff options
| author | Zach Mullen <zach.mullen@kitware.com> | 2009-11-10 10:40:24 -0500 |
|---|---|---|
| committer | Zach Mullen <zach.mullen@kitware.com> | 2009-11-10 10:40:24 -0500 |
| commit | c9c0ee4056aa651a63ee6c34abb06e60e987dbe3 (patch) | |
| tree | 869a02a81b1ff9cc2790bd73290030d743fac854 /Tests/CTestTestSubdir | |
| parent | 21a59bdc4d4c54af5cd175561f9249d5932434d2 (diff) | |
| download | cmake-c9c0ee4056aa651a63ee6c34abb06e60e987dbe3.tar.gz | |
Change logic of ctest subdirs command to allow for absolute paths. Also added test coverage for passing absolute paths to subdirs.
Diffstat (limited to 'Tests/CTestTestSubdir')
| -rw-r--r-- | Tests/CTestTestSubdir/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CTestTestSubdir/subdir/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CTestTestSubdir/subdir2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CTestTestSubdir/subdir2/main.c | 4 | ||||
| -rw-r--r-- | Tests/CTestTestSubdir/subdir3/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/CTestTestSubdir/subdir3/main.c | 4 |
6 files changed, 15 insertions, 1 deletions
diff --git a/Tests/CTestTestSubdir/CMakeLists.txt b/Tests/CTestTestSubdir/CMakeLists.txt index f5a1fe2907..5daa543a37 100644 --- a/Tests/CTestTestSubdir/CMakeLists.txt +++ b/Tests/CTestTestSubdir/CMakeLists.txt @@ -9,3 +9,5 @@ GET_FILENAME_COMPONENT(CTEST_COMMAND "${CMAKE_COMMAND}" PATH) SET(CTEST_COMMAND "${CTEST_COMMAND}/ctest") ADD_SUBDIRECTORY(subdir) +SUBDIRS(subdir2) +SUBDIRS("${CTestTestSubdir_SOURCE_DIR}/subdir3") diff --git a/Tests/CTestTestSubdir/subdir/CMakeLists.txt b/Tests/CTestTestSubdir/subdir/CMakeLists.txt index a92e13be57..b40d316d69 100644 --- a/Tests/CTestTestSubdir/subdir/CMakeLists.txt +++ b/Tests/CTestTestSubdir/subdir/CMakeLists.txt @@ -1,2 +1,2 @@ ADD_EXECUTABLE (main main.c) -ADD_TEST (TestMain main) +ADD_TEST (TestMain1 main) diff --git a/Tests/CTestTestSubdir/subdir2/CMakeLists.txt b/Tests/CTestTestSubdir/subdir2/CMakeLists.txt new file mode 100644 index 0000000000..23f8e07c2d --- /dev/null +++ b/Tests/CTestTestSubdir/subdir2/CMakeLists.txt @@ -0,0 +1,2 @@ +ADD_EXECUTABLE (main2 main.c) +ADD_TEST (TestMain2 main2) diff --git a/Tests/CTestTestSubdir/subdir2/main.c b/Tests/CTestTestSubdir/subdir2/main.c new file mode 100644 index 0000000000..8488f4e58f --- /dev/null +++ b/Tests/CTestTestSubdir/subdir2/main.c @@ -0,0 +1,4 @@ +int main(void) +{ + return 0; +} diff --git a/Tests/CTestTestSubdir/subdir3/CMakeLists.txt b/Tests/CTestTestSubdir/subdir3/CMakeLists.txt new file mode 100644 index 0000000000..9a44b12b8f --- /dev/null +++ b/Tests/CTestTestSubdir/subdir3/CMakeLists.txt @@ -0,0 +1,2 @@ +ADD_EXECUTABLE (main3 main.c) +ADD_TEST (TestMain3 main3) diff --git a/Tests/CTestTestSubdir/subdir3/main.c b/Tests/CTestTestSubdir/subdir3/main.c new file mode 100644 index 0000000000..8488f4e58f --- /dev/null +++ b/Tests/CTestTestSubdir/subdir3/main.c @@ -0,0 +1,4 @@ +int main(void) +{ + return 0; +} |