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

try disabling an apple-specific build rule

Browse Source
This commit is contained in:
jadebenn 2024-04-06 16:29:29 -05:00
parent 6e41423dc3
commit 45ec66e976
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakePresets.json
View File

@ -134,7 +134,8 @@
{ {
"name": "macos-debug", "name": "macos-debug",
"inherits": [ "inherits": [
"macos-config" "macos-config",
"debug-config"
], ],
"displayName": "[Debug] MacOS", "displayName": "[Debug] MacOS",
"description": "Create a debug build using MacOS" "description": "Create a debug build using MacOS"
@ -142,7 +143,8 @@
{ {
"name": "macos-release", "name": "macos-release",
"inherits": [ "inherits": [
"macos-config" "macos-config",
"release-config"
], ],
"displayName": "[Release] MacOS", "displayName": "[Release] MacOS",
"description": "Create a release build using MacOS" "description": "Create a release build using MacOS"
@ -209,6 +211,7 @@
"configurePreset": "macos-debug", "configurePreset": "macos-debug",
"displayName": "[Debug] MacOS", "displayName": "[Debug] MacOS",
"description": "This preset is used to build in debug mode on MacOS", "description": "This preset is used to build in debug mode on MacOS",
"configuration": "Debug",
"jobs": 2 "jobs": 2
}, },
{ {
@ -216,6 +219,7 @@
"configurePreset": "macos-release", "configurePreset": "macos-release",
"displayName": "[Release] MacOS", "displayName": "[Release] MacOS",
"description": "This preset is used to build in release mode on MacOS", "description": "This preset is used to build in release mode on MacOS",
"configuration": "Release",
"jobs": 2 "jobs": 2
} }
], ],

10
tests/CMakeLists.txt
View File

@ -6,11 +6,11 @@ include(GoogleTest)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
if(APPLE) #if(APPLE)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True) # set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
set(CMAKE_BUILD_WITH_INSTALL_RPATH True) # set(CMAKE_BUILD_WITH_INSTALL_RPATH True)
set(CMAKE_INSTALL_RPATH "@executable_path") # set(CMAKE_INSTALL_RPATH "@executable_path")
endif() #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})