mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2025-08-20 05:20:51 +00:00
Merge branch 'experimental' into controllerfixup
This commit is contained in:
commit
dce0fc992c
3 changed files with 66 additions and 2 deletions
|
@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
|
|||
PROJECT(Aquaria)
|
||||
|
||||
INCLUDE(CheckCCompilerFlag)
|
||||
INCLUDE(CheckCXXCompilerFlag)
|
||||
INCLUDE(CheckFunctionExists)
|
||||
|
||||
IF(NOT CMAKE_BUILD_TYPE)
|
||||
|
@ -381,8 +382,19 @@ IF(CMAKE_COMPILER_IS_GNUCC)
|
|||
ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
ENDIF(CMAKE_COMPILER_IS_GNUCC)
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wall -pedantic")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -pedantic")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -std=gnu99")
|
||||
|
||||
CHECK_CXX_COMPILER_FLAG("-std=gnu++11" AQUARIA_CC_HAS_GNUXX11)
|
||||
CHECK_CXX_COMPILER_FLAG("-std=gnu++1x" AQUARIA_CC_HAS_GNUXX1X)
|
||||
CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" AQUARIA_CC_HAS_GNUXX0X)
|
||||
IF(AQUARIA_CC_HAS_GNUXX11)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
|
||||
ELSEIF(AQUARIA_CC_HAS_GNUXX1X)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++1x")
|
||||
ELSEIF(AQUARIA_CC_HAS_GNUXX0X)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
|
||||
ENDIF(AQUARIA_CC_HAS_GNUXX11)
|
||||
|
||||
CHECK_FUNCTION_EXISTS(strcasecmp HAVE_STRCASECMP)
|
||||
IF(HAVE_STRCASECMP)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue