Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-21 21:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "more macos tinkering"

Browse Source 
This reverts commit 829ec35b57.
This commit is contained in:
jadebenn 2024-04-06 18:47:46 -05:00
parent 495e70c376
commit e143f22ada
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/dCommonTests/CMakeLists.txt
View File

@ -20,21 +20,19 @@ 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()
#set_target_properties(libmariadbcpp PROPERTIES IMPORTED_LOCATION @rpath/libmariadbcpp.dylib)
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()
# Link needed libraries
target_link_libraries(dCommonTests ${COMMON_LIBRARIES} GTest::gtest_main MariaDB::ConnCpp)
target_link_libraries(dCommonTests ${COMMON_LIBRARIES} GTest::gtest_main)
# Copy test files to testing directory
add_subdirectory(TestBitStreams)