dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2024-11-21 20:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compiler checks for newer gcc versions

Browse source 
Use CXX instead of C checks - newer gcc versions refuse some
C++ flags when compiling C.
This commit is contained in:
dhewg 2011-12-22 11:53:33 +01:00 committed by Daniel Gibson
parent a86defb0ca
commit 444da3574d
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CMakeLists.txt
View file

@ -24,7 +24,7 @@ cmake_minimum_required(VERSION 2.6)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/sys/cmake") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/sys/cmake")
set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE) set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
include(CheckCCompilerFlag) include(CheckCXXCompilerFlag)
option(CORE "Build the core" ON) option(CORE "Build the core" ON)
option(GAME "Build the base game code" ON) option(GAME "Build the base game code" ON)
@ -129,8 +129,8 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
add_definitions(-fno-strict-aliasing) add_definitions(-fno-strict-aliasing)
CHECK_C_COMPILER_FLAG("-fvisibility=hidden" cc_has_fvisibility) CHECK_CXX_COMPILER_FLAG("-fvisibility=hidden" cxx_has_fvisibility)
if (cc_has_fvisibility) if (cxx_has_fvisibility)
add_definitions(-fvisibility=hidden) add_definitions(-fvisibility=hidden)
endif() endif()
@ -139,8 +139,8 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
add_definitions(-Wno-switch) add_definitions(-Wno-switch)
add_definitions(-Wno-format-security) add_definitions(-Wno-format-security)
CHECK_C_COMPILER_FLAG("-Woverloaded-virtual" cc_has_Woverload_virtual) CHECK_CXX_COMPILER_FLAG("-Woverloaded-virtual" cxx_has_Woverload_virtual)
if (cc_has_Woverload_virtual) if (cxx_has_Woverload_virtual)
add_definitions(-Woverloaded-virtual) add_definitions(-Woverloaded-virtual)
endif() endif()
@ -151,8 +151,8 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
add_definitions(-arch x86_64 -mmacosx-version-min=10.6) add_definitions(-arch x86_64 -mmacosx-version-min=10.6)
set(ldflags ${ldflags} "-arch x86_64 -mmacosx-version-min=10.6") set(ldflags ${ldflags} "-arch x86_64 -mmacosx-version-min=10.6")
elseif (cpu STREQUAL "x86") elseif (cpu STREQUAL "x86")
CHECK_C_COMPILER_FLAG("-arch i386" cc_has_arch_i386) CHECK_CXX_COMPILER_FLAG("-arch i386" cxx_has_arch_i386)
if (cc_has_arch_i386) if (cxx_has_arch_i386)
add_definitions(-arch i386) add_definitions(-arch i386)
set(ldflags ${ldflags} "-arch i386") set(ldflags ${ldflags} "-arch i386")
endif() endif()
@ -160,8 +160,8 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
add_definitions(-mmacosx-version-min=10.4) add_definitions(-mmacosx-version-min=10.4)
set(ldflags ${ldflags} "-mmacosx-version-min=10.4") set(ldflags ${ldflags} "-mmacosx-version-min=10.4")
elseif (cpu STREQUAL "ppc") elseif (cpu STREQUAL "ppc")
CHECK_C_COMPILER_FLAG("-arch ppc" cc_has_arch_ppc) CHECK_CXX_COMPILER_FLAG("-arch ppc" cxx_has_arch_ppc)
if (cc_has_arch_ppc) if (cxx_has_arch_ppc)
add_definitions(-arch ppc) add_definitions(-arch ppc)
set(ldflags ${ldflags} "-arch ppc") set(ldflags ${ldflags} "-arch ppc")
endif() endif()