From a4b6b7c0d9b905dc53d5c34668d312c0a39a4e6c Mon Sep 17 00:00:00 2001 From: jadebenn Date: Sat, 6 Apr 2024 19:27:34 -0500 Subject: [PATCH] see if this re-breaks mac --- tests/CMakeLists.txt | 2 -- thirdparty/CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1e184716..4fb7d30e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,8 +8,6 @@ message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY = ${CMAKE_RUNTIME_OUTPUT_DIRECTOR set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY = ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") -message(STATUS "Executable Path: @executable_path") - if(APPLE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True) set(CMAKE_BUILD_WITH_INSTALL_RPATH True) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 9ce7f5a1..6a2f865e 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -23,8 +23,8 @@ if(NOT WIN32) target_include_directories(bcrypt PRIVATE "libbcrypt/include/bcrypt") endif() -# Need to define this on Clang (Linux) for 'strdup' support -if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +# Need to define this on Clang and GNU for 'strdup' support +if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR "GNU") target_compile_definitions(bcrypt PRIVATE "_POSIX_C_SOURCE=200809L") endif()