From 51de097fb10f6167affe710328555113d7bcfa63 Mon Sep 17 00:00:00 2001 From: Alexey Sheplyakov Date: Wed, 25 Dec 2019 20:41:17 +0400 Subject: [PATCH] Made it easier to run tests on windows Put executables and DLLs into the `bin` subdirectory so the system can locate GiNaC (and CLN) DLLs without extra configuration. --- CMakeLists.txt | 5 +++++ check/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7989df14..9aec3279 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,11 @@ set(ginaclib_version ${ginaclib_soversion}.${ginac_lt_age}.${ginac_lt_revision}) # make check enable_testing() add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) +if (WIN32) + if (NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) + endif() +endif() # make info add_custom_target(info ALL) add_custom_target(html) diff --git a/check/CMakeLists.txt b/check/CMakeLists.txt index 82e78e18..9c38932c 100644 --- a/check/CMakeLists.txt +++ b/check/CMakeLists.txt @@ -72,7 +72,7 @@ macro(add_ginac_test thename) add_executable(${thename} EXCLUDE_FROM_ALL ${${thename}_sources}) target_link_libraries(${thename} ginac ${LIBDL_LIBRARIES}) add_dependencies(check ${thename}) - add_test(NAME ${thename} COMMAND ${thename}${CMAKE_EXECUTABLE_SUFFIX}) + add_test(NAME ${thename} COMMAND $) endmacro() macro(add_ginac_timing thename) -- 2.49.0