From 994b113130e200e7851e63239dad78d26ebdcc3b Mon Sep 17 00:00:00 2001 From: George Tokmaji Date: Tue, 19 Sep 2023 19:58:54 +0200 Subject: [PATCH] Mac: Set CMAKE_OBJCXX_STANDARD and CMAKE_OBJCXX_FLAGS_INIT to the same values as their CXX counterparts --- CMakeLists.txt | 5 +++++ autobuild/clang16_mac.cmake | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee6ef7abe..c2a703c2e 100644 --- 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 index 52df6abf0..2e206d50a 100644 --- 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++")