diff options
| author | Brad King <brad.king@kitware.com> | 2007-03-12 14:23:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-03-12 14:23:06 (GMT) |
| commit | cf7eeab37aa644a0a09cb40e8958d99e8d771857 (patch) | |
| tree | 26654def4fd4d24ad01f258be6ab7ca446390fcb /Tests/ComplexRelativePaths/Executable | |
| parent | c03217d5609488b997313517abbac69abcabebc8 (diff) | |
| download | CMake-cf7eeab37aa644a0a09cb40e8958d99e8d771857.zip CMake-cf7eeab37aa644a0a09cb40e8958d99e8d771857.tar.gz CMake-cf7eeab37aa644a0a09cb40e8958d99e8d771857.tar.bz2 | |
ENH: Testing new target properties RUNTIME_OUTPUT_DIRECTORY, LIBRARY_OUTPUT_DIRECTORY, and ARCHIVE_OUTPUT_DIRECTORY. This is an incremental fix for bug#2240 and bug#4210.
Diffstat (limited to 'Tests/ComplexRelativePaths/Executable')
| -rw-r--r-- | Tests/ComplexRelativePaths/Executable/complex.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx index 1603a8c..dee36ce 100644 --- a/Tests/ComplexRelativePaths/Executable/complex.cxx +++ b/Tests/ComplexRelativePaths/Executable/complex.cxx @@ -320,12 +320,17 @@ extern "C" int NameConflictTest2(); int main() { std::string lib = BINARY_DIR; - lib += "/bin/"; + lib += "/lib/"; #ifdef CMAKE_INTDIR lib += CMAKE_INTDIR; lib += "/"; #endif - std::string exe = lib; + std::string exe = BINARY_DIR; + exe += "/bin/"; +#ifdef CMAKE_INTDIR + exe += CMAKE_INTDIR; + exe += "/"; +#endif #ifdef COMPLEX_TEST_CMAKELIB // Test a single character executable to test a: in makefiles |