diff options
author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-04-26 21:32:56 (GMT) |
---|---|---|
committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-04-26 21:32:56 (GMT) |
commit | d6090a2395a2e8e0c506e62a95e0e9dd197c6572 (patch) | |
tree | 3030c69e7dcc93a84fe308a73db6b45044661d4b /Tests/SubDir | |
parent | 62fec96d993975775410ebc2dceaa65b03a12ae2 (diff) | |
download | CMake-d6090a2395a2e8e0c506e62a95e0e9dd197c6572.zip CMake-d6090a2395a2e8e0c506e62a95e0e9dd197c6572.tar.gz CMake-d6090a2395a2e8e0c506e62a95e0e9dd197c6572.tar.bz2 |
ENH: When source file is in subdirectory put object file in subdirectory. Fixes Bug #290 - Source files in subdirectories should produce object files in subdirectories
Diffstat (limited to 'Tests/SubDir')
-rw-r--r-- | Tests/SubDir/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Tests/SubDir/Executable/test.cxx | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Tests/SubDir/CMakeLists.txt b/Tests/SubDir/CMakeLists.txt index b70b312..a1da9b6 100644 --- a/Tests/SubDir/CMakeLists.txt +++ b/Tests/SubDir/CMakeLists.txt @@ -1,3 +1,5 @@ PROJECT(SUBDIR) SUBDIRS(Executable EXCLUDE_FROM_ALL Examples) WRITE_FILE(${SUBDIR_BINARY_DIR}/ShouldBeHere "This file should exist.") + +ADD_EXECUTABLE(TestFromSubdir AnotherSubdir/testfromsubdir.c AnotherSubdir/secondone) diff --git a/Tests/SubDir/Executable/test.cxx b/Tests/SubDir/Executable/test.cxx index f351521..c528fb1 100644 --- a/Tests/SubDir/Executable/test.cxx +++ b/Tests/SubDir/Executable/test.cxx @@ -28,11 +28,22 @@ int FileExists(const char* filename) int main(int ac, char** av) { + if(ac <= 1) + { + printf("Usage: %s <file>\n", av[0]); + return 1; + } if(!FileExists(av[1])) { printf("Missing file %s\n", av[1]); return 1; } - printf("%s is there!", av[1]); + if(FileExists(av[2])) + { + printf("File %s should be in subdirectory\n", av[2]); + return 1; + } + printf("%s is not there! Good.", av[2]); + printf("%s is there! Good.", av[1]); return 0; } |