summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-11-29 22:02:35 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-11-29 22:02:35 (GMT)
commitf211823b5579be5aaf8f62dae870ad370326158f (patch)
tree3b173df971d28c6b654edc993f6a7ee3bda10156
parent9ffabcbb3fe14dd68f5998945e20078538df76bb (diff)
downloadCMake-f211823b5579be5aaf8f62dae870ad370326158f.zip
CMake-f211823b5579be5aaf8f62dae870ad370326158f.tar.gz
CMake-f211823b5579be5aaf8f62dae870ad370326158f.tar.bz2
ENH: fix test for configuration type builds
-rw-r--r--Source/CMakeLists.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index e53aca1..bd27b33 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -402,6 +402,10 @@ IF(BUILD_TESTING)
--test-command ${CMAKE_CMAKE_COMMAND} -E compare_files
${CMake_SOURCE_DIR}/Tests/TargetName/scripts/hello_world
${CMake_BINARY_DIR}/Tests/TargetName/scripts/hello_world)
+ SET(LIBNAME_DIR)
+ IF(CMAKE_CONFIGURATION_TYPES)
+ SET(LIBNAME_DIR Debug)
+ ENDIF(CMAKE_CONFIGURATION_TYPES)
ADD_TEST(LibName ${CMAKE_CTEST_COMMAND}
--build-and-test
@@ -411,7 +415,7 @@ IF(BUILD_TESTING)
--build-generator ${CMAKE_TEST_GENERATOR}
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
--build-project LibName
- --build-run-dir "${CMake_BINARY_DIR}/Tests/LibName/lib"
+ --build-run-dir "${CMake_BINARY_DIR}/Tests/LibName/lib/${LIBNAME_DIR}"
--test-command foobar
)