From ffdd957049bae02604330dab1298bff9589d6ac5 Mon Sep 17 00:00:00 2001 From: "Signed-off-by: Steven WdV" Date: Thu, 29 Feb 2024 15:12:36 +0100 Subject: [PATCH 1/2] Fix compilation on macOS without apple-clang Signed-off-by: Steven WdV --- library/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 1b2980dbc..d97c6510e 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -129,11 +129,11 @@ if(WIN32) set(libs ${libs} ws2_32) endif(WIN32) -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - SET(CMAKE_C_ARCHIVE_CREATE " Scr ") - SET(CMAKE_CXX_ARCHIVE_CREATE " Scr ") - SET(CMAKE_C_ARCHIVE_FINISH " -no_warning_for_no_symbols -c ") - SET(CMAKE_CXX_ARCHIVE_FINISH " -no_warning_for_no_symbols -c ") +if(CMAKE_C_COMPILER_ID MATCHES "AppleClang") + set(CMAKE_C_ARCHIVE_CREATE " Scr ") + set(CMAKE_CXX_ARCHIVE_CREATE " Scr ") + set(CMAKE_C_ARCHIVE_FINISH " -no_warning_for_no_symbols -c ") + set(CMAKE_CXX_ARCHIVE_FINISH " -no_warning_for_no_symbols -c ") endif() if(HAIKU) From f7acf91e5f28e35636c277f4b96cee7e47e96969 Mon Sep 17 00:00:00 2001 From: Steven WdV Date: Tue, 19 Mar 2024 11:39:22 +0100 Subject: [PATCH 2/2] Check C/C++ compilers separately for AppleClang ranlib Signed-off-by: Steven WdV --- library/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index d97c6510e..2803dca55 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -131,8 +131,10 @@ endif(WIN32) if(CMAKE_C_COMPILER_ID MATCHES "AppleClang") set(CMAKE_C_ARCHIVE_CREATE " Scr ") - set(CMAKE_CXX_ARCHIVE_CREATE " Scr ") set(CMAKE_C_ARCHIVE_FINISH " -no_warning_for_no_symbols -c ") +endif() +if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") + set(CMAKE_CXX_ARCHIVE_CREATE " Scr ") set(CMAKE_CXX_ARCHIVE_FINISH " -no_warning_for_no_symbols -c ") endif()