From 445e091ffaa1f3b8d745fde38ab02680781088b9 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Wed, 29 Nov 2006 21:36:13 -0500
Subject: 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

---
 Source/CMakeLists.txt        | 11 +----------
 Tests/LibName/CMakeLists.txt |  1 +
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index efe2b9f..32e815e 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -402,15 +402,6 @@ 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)
-  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 @@ IF(BUILD_TESTING)
     --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
     )
 
diff --git a/Tests/LibName/CMakeLists.txt b/Tests/LibName/CMakeLists.txt
index 649aae3..e97b6b1 100644
--- a/Tests/LibName/CMakeLists.txt
+++ b/Tests/LibName/CMakeLists.txt
@@ -1,5 +1,6 @@
 project(LibName)
 set(LIBRARY_OUTPUT_PATH lib)
+set(EXECUTABLE_OUTPUT_PATH lib)
 add_library(bar SHARED bar.c)
 add_library(foo SHARED foo.c)
 target_link_libraries(foo bar)
-- 
cgit v0.12