From b9dd0bb7058bd17b8ca9d1ebf2aee844c5a94a7a Mon Sep 17 00:00:00 2001 From: stefan <stefan@5a81b35b-ba03-0410-adc8-b2c5c5119f08> Date: Thu, 27 May 2010 13:54:40 +0000 Subject: [PATCH] CMake, fix make check (wrong execution path) git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2291 5a81b35b-ba03-0410-adc8-b2c5c5119f08 --- cmake_support/OST.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake_support/OST.cmake b/cmake_support/OST.cmake index 7df33d611..26647bc81 100644 --- a/cmake_support/OST.cmake +++ b/cmake_support/OST.cmake @@ -494,7 +494,7 @@ macro(ost_unittest MODULE SOURCE_FILES) target_link_libraries(${_test_name} ${BOOST_UNIT_TEST_LIBRARIES} "ost_${MODULE}") add_custom_target("${_test_name}_run" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${_test_name}.exe || echo - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/.. + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/.. COMMENT "running checks for module ${MODULE}" DEPENDS ${_test_name}) add_test("${_test_name}" ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${_test_name}.exe) @@ -503,7 +503,7 @@ macro(ost_unittest MODULE SOURCE_FILES) "ost_${MODULE}") add_custom_target("${_test_name}_run" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${_test_name} || echo - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "running checks for module ${MODULE}" DEPENDS ${_test_name}) add_test("${_test_name}" ${CMAKE_CURRENT_BINARY_DIR}/${_test_name} ) @@ -522,13 +522,13 @@ macro(ost_unittest MODULE SOURCE_FILES) set (PY_TESTS_CMD "${EXECUTABLE_OUTPUT_PATH}/ost.bat") add_custom_target("${py_test}_run" CALL "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} || echo" - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "running checks ${py_test}" VERBATIM) else() set (PY_TESTS_CMD "${EXECUTABLE_OUTPUT_PATH}/ost") add_custom_target("${py_test}_run" sh -c "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} || echo" - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "running checks ${py_test}" VERBATIM) endif() add_dependencies("${py_test}_run" ost_scripts "_${MODULE}") -- GitLab