From 3f6403e279d3f0965938250f263cdd9fdfef5f4a Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Mon, 25 Sep 2023 21:14:26 -0600 Subject: [PATCH] Stop manipulating standard library flags for macOS builds --- CMakeLists.txt | 4 ++++ cmake/Macros.cmake | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d409652ba..a56f25b15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,6 +202,10 @@ if(SFML_OS_MACOS) # configure Xcode templates set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)") + + if(NOT SFML_COMPILER_CLANG) + message(FATAL_ERROR "Clang is the only supported compiler on macOS") + endif() endif() # set the output directory for SFML DLLs and executables diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake index 5224a1f5d..5890c298c 100644 --- a/cmake/Macros.cmake +++ b/cmake/Macros.cmake @@ -27,14 +27,6 @@ function(sfml_set_stdlib target) target_link_libraries(${target} PRIVATE "-shared-libgcc" "-shared-libstdc++") endif() endif() - - if(SFML_OS_MACOS) - if(${CMAKE_GENERATOR} MATCHES "Xcode") - sfml_set_xcode_property(${target} CLANG_CXX_LIBRARY "libc++") - elseif(NOT SFML_COMPILER_CLANG) - message(FATAL_ERROR "Clang is the only supported compiler on macOS") - endif() - endif() endfunction() function(sfml_set_common_ios_properties target)