From 54876bf886b16f7c217af82aa805cf85321f369e Mon Sep 17 00:00:00 2001
From: jadebenn <jadebenn@users.noreply.github.com>
Date: Sat, 6 Apr 2024 18:47:50 -0500
Subject: [PATCH] Revert "try stripping out all the custom macos test logic
 again"

This reverts commit cc15a26ce80ff9cfec5f1a94b0c00c42e1832c55.
---
 tests/CMakeLists.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ccb78eae..7d3e6730 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,20 +4,20 @@ enable_testing()
 find_package(GoogleTest REQUIRED)
 include(GoogleTest)
 
-message(STATUS "CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}")
+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()
+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 $<TARGET_FILE:MariaDB::ConnCpp> ${CMAKE_CURRENT_BINARY_DIR}) #${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+	${CMAKE_COMMAND} -E copy $<TARGET_FILE:MariaDB::ConnCpp> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 
 # Add the subdirectories
 add_subdirectory(dCommonTests)