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/Complex | |
| 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/Complex')
| -rw-r--r-- | Tests/Complex/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Tests/Complex/Executable/complex.cxx | 9 | ||||
| -rw-r--r-- | Tests/Complex/Library/CMakeLists.txt | 1 |
3 files changed, 11 insertions, 9 deletions
diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt index deb0800..88acae8 100644 --- a/Tests/Complex/CMakeLists.txt +++ b/Tests/Complex/CMakeLists.txt @@ -137,13 +137,9 @@ SET(FORCE_TEST 0 CACHE STRING "a test" FORCE) # # Lib and exe path # -SET (LIBRARY_OUTPUT_PATH - ${Complex_BINARY_DIR}/bin/ CACHE INTERNAL - "Single output directory for building all libraries.") - -SET (EXECUTABLE_OUTPUT_PATH - ${Complex_BINARY_DIR}/bin/ CACHE INTERNAL - "Single output directory for building all executables.") +SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${Complex_BINARY_DIR}/lib/static") +SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${Complex_BINARY_DIR}/lib") +SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${Complex_BINARY_DIR}/bin") MESSAGE (Test " " escape " " semi-colon " " \; \;) # diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx index 1603a8c..dee36ce 100644 --- a/Tests/Complex/Executable/complex.cxx +++ b/Tests/Complex/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 diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt index 3a74efc..495ceb8 100644 --- a/Tests/Complex/Library/CMakeLists.txt +++ b/Tests/Complex/Library/CMakeLists.txt @@ -7,6 +7,7 @@ REMOVE_DEFINITIONS(-DCMAKE_IS_REALLY_FUN) # UTILITY_SOURCE(CREATE_FILE_EXE create_file "." create_file.cxx) ADD_EXECUTABLE(create_file create_file.cxx) +SET_TARGET_PROPERTIES(create_file PROPERTIES RUNTIME_OUTPUT_DIRECTORY ".") # # Create static library |