Mac: Set CMAKE_OBJCXX_STANDARD and CMAKE_OBJCXX_FLAGS_INIT to the sam…

…e values as their CXX counterparts
legacyclonk · Sep 21, 2023 · 994b113 · 994b113
1 parent e0e26dd
commit 994b113
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,6 +37,11 @@ project("LegacyClonk" LANGUAGES CXX ${LANGUAGE_OBJCXX})
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+if (APPLE)
+	set(CMAKE_OBJCXX_STANDARD ${CMAKE_CXX_STANDARD})
+	set(CMAKE_OBJCXX_STANDARD_REQUIRED ${CMAKE_CXX_STANDARD_REQUIRED})
+endif ()
+
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 include(CheckCXXSymbolExists)

diff --git a/autobuild/clang16_mac.cmake b/autobuild/clang16_mac.cmake
@@ -3,7 +3,8 @@ set(CMAKE_C_COMPILER "/usr/local/opt/llvm/bin/clang")
 set(CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++")
 
 set(CMAKE_C_FLAGS_INIT "-stdlib=libc++ -fexperimental-library -Wno-parentheses")
-set(CMAKE_CXX_FLAGS_INIT "-stdlib=libc++ -fexperimental-library -Wno-parentheses")
+set(CMAKE_CXX_FLAGS_INIT "${CMAKE_C_FLAGS_INIT}")
+set(CMAKE_OBJCXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT}")
 
 set(CMAKE_EXE_LINKER_FLAGS_INIT "-L/usr/local/opt/llvm/lib/c++")
 set(CMAKE_SHARED_LINKER_FLAGS_INIT "-L/usr/local/opt/llvm/lib/c++")