From 22208fbf513ef434ff69805ba637669d0adb6b35 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Mon, 3 Aug 2020 11:10:05 +0300 Subject: [PATCH 1/2] tests binary dir fix --- CMakeLists.txt | 1 + tests/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e08b469..87748bab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,6 +224,7 @@ if (DEFINED LIBPROJECT) endif() if (TESTS) + set(PIP_ROOT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}") add_subdirectory(tests) endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7f52c1a6..befc771e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -4,10 +4,13 @@ macro(pip_test NAME LIBS) file(GLOB _CPPS "${NAME}/*.cpp") file(GLOB _HDRS "${NAME}/*.h") set(_target pip_${NAME}_test) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PIP_ROOT_BINARY_DIR}") + message("${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") add_executable(${_target} ${_CPPS} ${_HDRS}) target_link_libraries(${_target} pip ${LIBS} gtest_main gmock_main) add_test(NAME ${_target} COMMAND tests) add_custom_target(${_target}_perform ALL COMMAND ${_target}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY) list(APPEND PIP_TESTS_LIST "${NAME}") set(PIP_TESTS_LIST ${PIP_TESTS_LIST} PARENT_SCOPE) endmacro() From 9cd108cf20276d04e6ef4522afc4e5f2e5f9a2bb Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Mon, 3 Aug 2020 11:10:27 +0300 Subject: [PATCH 2/2] tests binary dir fix --- tests/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index befc771e..71177e1d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,7 +5,6 @@ macro(pip_test NAME LIBS) file(GLOB _HDRS "${NAME}/*.h") set(_target pip_${NAME}_test) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PIP_ROOT_BINARY_DIR}") - message("${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") add_executable(${_target} ${_CPPS} ${_HDRS}) target_link_libraries(${_target} pip ${LIBS} gtest_main gmock_main) add_test(NAME ${_target} COMMAND tests)