mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2024-11-22 05:27:19 +00:00
was not actually fixed
This commit is contained in:
parent
fab74c90b6
commit
6c6966afd2
@ -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"
|
||||||
@ -281,7 +283,7 @@
|
|||||||
"configurePreset": "macos-debug",
|
"configurePreset": "macos-debug",
|
||||||
"displayName": "[Debug] MacOS",
|
"displayName": "[Debug] MacOS",
|
||||||
"description": "Runs all tests on a MacOS configuration",
|
"description": "Runs all tests on a MacOS configuration",
|
||||||
"configuration": "Release"
|
"configuration": "Debug"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "macos-release",
|
"name": "macos-release",
|
||||||
|
@ -4,9 +4,9 @@ enable_testing()
|
|||||||
find_package(GoogleTest REQUIRED)
|
find_package(GoogleTest REQUIRED)
|
||||||
include(GoogleTest)
|
include(GoogleTest)
|
||||||
|
|
||||||
#message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY = ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
|
message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY = ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
|
||||||
#message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY = ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
|
message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY = ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
|
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
|
||||||
|
Loading…
Reference in New Issue
Block a user