[cmake-commits] hoffman committed CMakeLists.txt 1.312 1.313

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: fix test to run with debug or release and put the exe next to the dll, still shows the bug this is testing for


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- CMakeLists.txt	29 Nov 2006 22:45:55 -0000	1.312
+++ CMakeLists.txt	30 Nov 2006 02:36:13 -0000	1.313
@@ -402,15 +402,6 @@
     --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)
-  IF(WIN32)
-    SET(RUN_DIR "${CMake_BINARY_DIR}/Tests/LibName/lib/${LIBNAME_DIR}")
-  ELSE(WIN32)
-    SET(RUN_DIR "${CMake_BINARY_DIR}/Tests/LibName/")
-  ENDIF(WIN32)
   ADD_TEST(LibName ${CMAKE_CTEST_COMMAND}
     --build-and-test
     "${CMake_SOURCE_DIR}/Tests/LibName"
@@ -419,7 +410,7 @@
     --build-generator ${CMAKE_TEST_GENERATOR}
     --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
     --build-project LibName 
-    --build-run-dir "${RUN_DIR}"
+    --build-exe-dir "${CMake_BINARY_DIR}/Tests/LibName/lib"
     --test-command foobar
     )