diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index b6cd81db39..58cac804dd 100644 --- 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,7 +168,6 @@ function(set_common_target_properties TARGET) target_compile_options(${TARGET} PRIVATE - $<$:-stdlib=libc++> $<$:/wd4244> $<$:/wd4267> $<$:/wd4273> @@ -172,7 +175,6 @@ function(set_common_target_properties TARGET) target_link_options(${TARGET} PRIVATE - $<$:-stdlib=libc++> $<$:-Wl,--no-undefined> ) diff --git a/cmake/Info-framework.plist.in b/cmake/Info-framework.plist.in index e5dbbf3b14..fe97c3a0a2 100644 --- a/cmake/Info-framework.plist.in +++ b/cmake/Info-framework.plist.in @@ -30,6 +30,6 @@ @CARLA_OSX_DEPLOYMENT_TARGET@ NSHumanReadableCopyright (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 +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.