diff options
| author | Piotr Dziwiński <piotrdz@gmail.com> | 2013-01-10 10:41:10 -0800 |
|---|---|---|
| committer | Piotr Dziwiński <piotrdz@gmail.com> | 2013-01-10 10:41:10 -0800 |
| commit | 35faf628cf8085a9262c2b89999cacdd3f5bee79 (patch) | |
| tree | d2d54753e320651b24076f6abbd36ffdd538cf7f | |
| parent | 3c94a6987007b60355dedb9db5c7bdef48b28369 (diff) | |
| parent | 0f74cf96b784b59853e7fe44dc2c89d48785cf46 (diff) | |
| download | colobot-35faf628cf8085a9262c2b89999cacdd3f5bee79.tar.gz colobot-35faf628cf8085a9262c2b89999cacdd3f5bee79.tar.bz2 colobot-35faf628cf8085a9262c2b89999cacdd3f5bee79.zip | |
Merge pull request #117 from OdyX/dev-C++11-fixes
C++11 fixes to get travis build
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 25 |
2 files changed, 18 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 9690ccf..96a7443 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,11 @@ language: cpp compiler: - gcc -script: cmake . -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test + - clang +script: mkdir build; cd build; cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test && DESTDIR=. make install before_install: - git submodule update --init --recursive + - sudo add-apt-repository ppa:mapnik/boost -y - sudo apt-get update -qq - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin notifications: diff --git a/CMakeLists.txt b/CMakeLists.txt index 674c627..2e309d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,29 +46,34 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE debug) endif() -# Global compile flags -# These are specific to GCC/MinGW/clang; for other compilers, change as necessary -# The flags are used throughout src/ subdir -set(COLOBOT_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast -std=c++11") -set(COLOBOT_CXX_FLAGS_RELEASE "-O2") -set(COLOBOT_CXX_FLAGS_DEBUG "-g -O0") - # Compiler detection if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") execute_process( COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) - if (NOT (GCC_VERSION VERSION_GREATER 4.6 OR GCC_VERSION VERSION_EQUAL 4.6)) - message(FATAL_ERROR "${PROJECT_NAME} requires GCC 4.6 or greater.") - else() + if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7) + message(STATUS "Detected GCC version 4.7+") + set(CXX11_FLAGS "-std=c++11") + elseif (GCC_VERSION VERSION_GREATER 4.6 OR GCC_VERSION VERSION_EQUAL 4.6) message(STATUS "Detected GCC version 4.6+") + set(CXX11_FLAGS "-std=c++0x") + else() + message(FATAL_ERROR "${PROJECT_NAME} requires GCC 4.6 or greater.") endif() elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") message(STATUS "Detected Clang compiler") + set(CXX11_FLAGS "-std=c++11") else() message(FATAL_ERROR "Your C++ compiler doesn't seem to support C++11.\n" "Supported compilers at this time are GCC 4.6+ and clang.") endif() +# Global compile flags +# These are specific to GCC/MinGW/clang; for other compilers, change as necessary +# The flags are used throughout src/ subdir +set(COLOBOT_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wold-style-cast ${CXX11_FLAGS}") +set(COLOBOT_CXX_FLAGS_RELEASE "-O2") +set(COLOBOT_CXX_FLAGS_DEBUG "-g -O0") + # Asserts can be enabled/disabled regardless of build type option(ASSERTS "Enable assert()s" ON) |