cmake: set -stdlib=libc++ globally

Signed-off-by: falkTX <[email protected]>
falkTX · Jul 20, 2023 · d1810f7 · d1810f7
1 parent c25d18b
commit d1810f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -22,6 +22,10 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
 
 set_property(GLOBAL PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
 
+if(APPLE)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+endif()
+
 #######################################################################################################################
 # fix compat with cmake < 3.26
 
@@ -164,15 +168,13 @@ function(set_common_target_properties TARGET)
 
  target_compile_options(${TARGET}
  PRIVATE
- $<$<BOOL:${APPLE}>:-stdlib=libc++>
  $<$<BOOL:${MSVC}>:/wd4244>
  $<$<BOOL:${MSVC}>:/wd4267>
  $<$<BOOL:${MSVC}>:/wd4273>
  )
 
  target_link_options(${TARGET}
  PRIVATE
- $<$<BOOL:${APPLE}>:-stdlib=libc++>
  $<$<C_COMPILER_ID:GNU>:-Wl,--no-undefined>
  )
 

diff --git a/cmake/Info-framework.plist.in b/cmake/Info-framework.plist.in
@@ -30,6 +30,6 @@
  <string>@CARLA_OSX_DEPLOYMENT_TARGET@</string>
  <key>NSHumanReadableCopyright</key>
  <string>(C) 2011-2023 Filipe Coelho.
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or any later version</string>
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or any later version.</string>
 </dict>
 </plist>