From 8f5c10d15806b0b9f5e425e146f67bc3da4b34ca Mon Sep 17 00:00:00 2001 From: jadebenn Date: Sat, 6 Apr 2024 18:47:52 -0500 Subject: [PATCH] Revert "try and narrow down the macos build failure cause" This reverts commit 5fd86833fa6e421860496c3626415ab70c93a795. --- tests/CMakeLists.txt | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7d3e6730..bc44bd30 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -4,20 +4,16 @@ enable_testing() find_package(GoogleTest REQUIRED) include(GoogleTest) -message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY = ${CMAKE_CURRENT_BINARY_DIR}/bin") +#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() - -message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY = ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") +#if(APPLE) +# set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True) +# set(CMAKE_BUILD_WITH_INSTALL_RPATH True) +# set(CMAKE_INSTALL_RPATH "@executable_path") +#endif() 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)