From cc15a26ce80ff9cfec5f1a94b0c00c42e1832c55 Mon Sep 17 00:00:00 2001 From: jadebenn Date: Sat, 6 Apr 2024 17:09:45 -0500 Subject: [PATCH] try stripping out all the custom macos test logic again --- tests/CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7d3e6730..ccb78eae 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -4,20 +4,20 @@ enable_testing() find_package(GoogleTest REQUIRED) include(GoogleTest) -message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY = ${CMAKE_CURRENT_BINARY_DIR}/bin") +message(STATUS "CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}") -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) +#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) -if(APPLE) - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True) - set(CMAKE_BUILD_WITH_INSTALL_RPATH True) - set(CMAKE_INSTALL_RPATH "@executable_path") -endif() +#if(APPLE) +# set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True) +# set(CMAKE_BUILD_WITH_INSTALL_RPATH True) +# set(CMAKE_INSTALL_RPATH "@executable_path") +#endif() -message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY = ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") +#message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY = ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") add_custom_target(conncpp_tests - ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + ${CMAKE_COMMAND} -E copy $ ${CMAKE_CURRENT_BINARY_DIR}) #${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) # Add the subdirectories add_subdirectory(dCommonTests)