[cmake-commits] hoffman committed CMakeLists.txt 1.310 1.311

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv7889

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: fix test for configuration type builds


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -r1.310 -r1.311
--- CMakeLists.txt	29 Nov 2006 20:58:19 -0000	1.310
+++ CMakeLists.txt	29 Nov 2006 22:02:35 -0000	1.311
@@ -402,6 +402,10 @@
     --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 @@
     --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
     )