diff --git a/CMakePresets.json b/CMakePresets.json index d3952f1e..fae32028 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -134,7 +134,8 @@ { "name": "macos-debug", "inherits": [ - "macos-config" + "macos-config", + "debug-config" ], "displayName": "[Debug] MacOS", "description": "Create a debug build using MacOS" @@ -142,7 +143,8 @@ { "name": "macos-release", "inherits": [ - "macos-config" + "macos-config", + "release-config" ], "displayName": "[Release] MacOS", "description": "Create a release build using MacOS" @@ -209,6 +211,7 @@ "configurePreset": "macos-debug", "displayName": "[Debug] MacOS", "description": "This preset is used to build in debug mode on MacOS", + "configuration": "Debug", "jobs": 2 }, { @@ -216,6 +219,7 @@ "configurePreset": "macos-release", "displayName": "[Release] MacOS", "description": "This preset is used to build in release mode on MacOS", + "configuration": "Release", "jobs": 2 } ], diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e8765191..b4f9d2d0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -6,11 +6,11 @@ include(GoogleTest) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) -if(APPLE) - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True) - set(CMAKE_BUILD_WITH_INSTALL_RPATH True) - set(CMAKE_INSTALL_RPATH "@executable_path") -endif() +#if(APPLE) +# set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True) +# set(CMAKE_BUILD_WITH_INSTALL_RPATH True) +# set(CMAKE_INSTALL_RPATH "@executable_path") +#endif() add_custom_target(conncpp_tests ${CMAKE_COMMAND} -E copy $ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})