From 829ec35b57983ad4444d90ab780fff95a8b47608 Mon Sep 17 00:00:00 2001 From: jadebenn Date: Sat, 6 Apr 2024 17:43:47 -0500 Subject: [PATCH] more macos tinkering --- tests/dCommonTests/CMakeLists.txt | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/dCommonTests/CMakeLists.txt b/tests/dCommonTests/CMakeLists.txt index fadf43c4..a20e4b6b 100644 --- a/tests/dCommonTests/CMakeLists.txt +++ b/tests/dCommonTests/CMakeLists.txt @@ -20,19 +20,21 @@ add_executable(dCommonTests ${DCOMMONTEST_SOURCES}) add_dependencies(dCommonTests conncpp_tests) # Apple needs some special linkage for the mariadb connector for tests. -if(APPLE) -add_custom_command(TARGET dCommonTests POST_BUILD - COMMAND otool ARGS -l dCommonTests - COMMAND otool ARGS -L dCommonTests - COMMAND ls - COMMAND otool ARGS -D libmariadbcpp.dylib - COMMAND install_name_tool ARGS -change libmariadbcpp.dylib @rpath/libmariadbcpp.dylib dCommonTests - COMMAND otool ARGS -L dCommonTests - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) -endif() +#if(APPLE) +#add_custom_command(TARGET dCommonTests POST_BUILD +# COMMAND otool ARGS -l dCommonTests +# COMMAND otool ARGS -L dCommonTests +# COMMAND ls +# COMMAND otool ARGS -D libmariadbcpp.dylib +# COMMAND install_name_tool ARGS -change libmariadbcpp.dylib @rpath/libmariadbcpp.dylib dCommonTests +# COMMAND otool ARGS -L dCommonTests +# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +#endif() + +#set_target_properties(libmariadbcpp PROPERTIES IMPORTED_LOCATION @rpath/libmariadbcpp.dylib) # Link needed libraries -target_link_libraries(dCommonTests ${COMMON_LIBRARIES} GTest::gtest_main) +target_link_libraries(dCommonTests ${COMMON_LIBRARIES} GTest::gtest_main MariaDB::ConnCpp) # Copy test files to testing directory add_subdirectory(TestBitStreams)