zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-30 16:00:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed detection of Apple's Clang

Browse source
This commit is contained in:
alexey.lysiuk 2020-10-17 13:33:22 +03:00
parent 0478838a9d
commit d4bb2fa418
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -132,13 +132,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( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE TRUE ) set( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE TRUE )
else() else()
set( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE FALSE ) set( ZD_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( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE TRUE ) set( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE TRUE )
else() else()
set( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE FALSE ) set( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE FALSE )
@ -272,12 +272,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()

2
src/CMakeLists.txt
View file

@ -307,7 +307,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
set( CMAKE_C_FLAGS "-Wno-unused-result ${CMAKE_C_FLAGS}" ) set( CMAKE_C_FLAGS "-Wno-unused-result ${CMAKE_C_FLAGS}" )
set( CMAKE_CXX_FLAGS "-Wno-unused-result ${CMAKE_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "-Wno-unused-result ${CMAKE_CXX_FLAGS}" )
endif() endif()
if( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" ) if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
if( APPLE OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.6" ) if( APPLE OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.6" )
set( CMAKE_CXX_FLAGS "-Wno-inconsistent-missing-override ${CMAKE_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "-Wno-inconsistent-missing-override ${CMAKE_CXX_FLAGS}" )
endif() endif()