Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-05-23 15:22:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: macos?

Browse Source
This commit is contained in:
Xiphoseer 2024-01-05 22:32:27 +01:00
parent 4569ea29d5
commit a52cfb5b0b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/FindMariaDB.cmake
View File

@ -142,7 +142,8 @@ if(WIN32)
IMPORTED_IMPLIB "${MARIADB_IMPLIB_LOCATION}") IMPORTED_IMPLIB "${MARIADB_IMPLIB_LOCATION}")
elseif(APPLE) elseif(APPLE)
set_target_properties(MariaDB::ConnCpp PROPERTIES set_target_properties(MariaDB::ConnCpp PROPERTIES
MACOSX_RPATH TRUE) MACOSX_RPATH TRUE
INSTALL_NAME_DIR "@rpath")
endif() endif()
# Add directories to include lists # Add directories to include lists

8
tests/CMakeLists.txt
View File

@ -6,9 +6,11 @@ include(GoogleTest)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True) if(APPLE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH True) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
set(CMAKE_INSTALL_RPATH "@executable_path") set(CMAKE_BUILD_WITH_INSTALL_RPATH True)
set(CMAKE_INSTALL_RPATH "@executable_path")
endif()
add_custom_target(conncpp_tests add_custom_target(conncpp_tests
${CMAKE_COMMAND} -E copy $<TARGET_FILE:MariaDB::ConnCpp> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) ${CMAKE_COMMAND} -E copy $<TARGET_FILE:MariaDB::ConnCpp> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})