summaryrefslogtreecommitdiff
path: root/Tests/ComplexOneConfig
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2007-03-12 10:23:06 -0400
committerBrad King <brad.king@kitware.com>2007-03-12 10:23:06 -0400
commitcf7eeab37aa644a0a09cb40e8958d99e8d771857 (patch)
tree26654def4fd4d24ad01f258be6ab7ca446390fcb /Tests/ComplexOneConfig
parentc03217d5609488b997313517abbac69abcabebc8 (diff)
downloadcmake-cf7eeab37aa644a0a09cb40e8958d99e8d771857.tar.gz
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/ComplexOneConfig')
-rw-r--r--Tests/ComplexOneConfig/CMakeLists.txt10
-rw-r--r--Tests/ComplexOneConfig/Executable/complex.cxx9
-rw-r--r--Tests/ComplexOneConfig/Library/CMakeLists.txt1
3 files changed, 11 insertions, 9 deletions
diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt
index deb0800e1e..88acae80ca 100644
--- a/Tests/ComplexOneConfig/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/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/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx
index 1603a8ce5e..dee36ce573 100644
--- a/Tests/ComplexOneConfig/Executable/complex.cxx
+++ b/Tests/ComplexOneConfig/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/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt
index 3a74efc9d9..495ceb8fe2 100644
--- a/Tests/ComplexOneConfig/Library/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/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