mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2024-11-21 21:17:25 +00:00
more macos tinkering
This commit is contained in:
parent
1a05b027fe
commit
829ec35b57
@ -20,19 +20,21 @@ add_executable(dCommonTests ${DCOMMONTEST_SOURCES})
|
|||||||
add_dependencies(dCommonTests conncpp_tests)
|
add_dependencies(dCommonTests conncpp_tests)
|
||||||
|
|
||||||
# Apple needs some special linkage for the mariadb connector for tests.
|
# Apple needs some special linkage for the mariadb connector for tests.
|
||||||
if(APPLE)
|
#if(APPLE)
|
||||||
add_custom_command(TARGET dCommonTests POST_BUILD
|
#add_custom_command(TARGET dCommonTests POST_BUILD
|
||||||
COMMAND otool ARGS -l dCommonTests
|
# COMMAND otool ARGS -l dCommonTests
|
||||||
COMMAND otool ARGS -L dCommonTests
|
# COMMAND otool ARGS -L dCommonTests
|
||||||
COMMAND ls
|
# COMMAND ls
|
||||||
COMMAND otool ARGS -D libmariadbcpp.dylib
|
# COMMAND otool ARGS -D libmariadbcpp.dylib
|
||||||
COMMAND install_name_tool ARGS -change libmariadbcpp.dylib @rpath/libmariadbcpp.dylib dCommonTests
|
# COMMAND install_name_tool ARGS -change libmariadbcpp.dylib @rpath/libmariadbcpp.dylib dCommonTests
|
||||||
COMMAND otool ARGS -L dCommonTests
|
# COMMAND otool ARGS -L dCommonTests
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
||||||
endif()
|
#endif()
|
||||||
|
|
||||||
|
#set_target_properties(libmariadbcpp PROPERTIES IMPORTED_LOCATION @rpath/libmariadbcpp.dylib)
|
||||||
|
|
||||||
# Link needed libraries
|
# 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
|
# Copy test files to testing directory
|
||||||
add_subdirectory(TestBitStreams)
|
add_subdirectory(TestBitStreams)
|
||||||
|
Loading…
Reference in New Issue
Block a user