zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed detection of Apple's Clang

This commit is contained in:
alexey.lysiuk 2020-12-28 13:45:40 +02:00
parent 38faefa663
commit f5bb8a5714
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -133,13 +133,13 @@ else()
endif() endif()
# Replacement variables for a possible long list of C/C++ compilers compatible with GCC # Replacement variables for a possible long list of C/C++ compilers compatible with GCC
if( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" ) if( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang" )
set( DEM_CMAKE_COMPILER_IS_GNUC_COMPATIBLE TRUE ) set( DEM_CMAKE_COMPILER_IS_GNUC_COMPATIBLE TRUE )
else() else()
set( DEM_CMAKE_COMPILER_IS_GNUC_COMPATIBLE FALSE ) set( DEM_CMAKE_COMPILER_IS_GNUC_COMPATIBLE FALSE )
endif() endif()
if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" ) if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
set( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE TRUE ) set( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE TRUE )
else() else()
set( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE FALSE ) set( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE FALSE )
@ -279,12 +279,7 @@ else()
if( APPLE ) if( APPLE )
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
if( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" ) if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
# With standard Apple tools -stdlib=libc++ needs to be specified in order to get
# C++11 support using SDKs 10.7 and 10.8.
set( CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}" )
set( CMAKE_EXE_LINKER_FLAGS "-stdlib=libc++ ${CMAKE_EXE_LINKER_FLAGS}" )
elseif( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
# If we're compiling with a custom GCC on the Mac (which we know since g++-4.2 doesn't support C++11) statically link libgcc. # If we're compiling with a custom GCC on the Mac (which we know since g++-4.2 doesn't support C++11) statically link libgcc.
set( ALL_C_FLAGS "-static-libgcc" ) set( ALL_C_FLAGS "-static-libgcc" )
endif() endif()