kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Bill Hoffman 2006-11-29 21:36:13 -05:00
parent b56a60d01e
commit 445e091ffa
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/CMakeLists.txt
View File

@ -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
)

1
Tests/LibName/CMakeLists.txt
View File

@ -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)