diff options
| author | Andrew Okin <forkk@forkk.net> | 2013-02-21 12:35:33 -0600 |
|---|---|---|
| committer | Andrew Okin <forkk@forkk.net> | 2013-02-21 12:35:33 -0600 |
| commit | 36499049741c15f7f26bc157128976d1d9a75319 (patch) | |
| tree | 8f67bd94c9f60c45392b8d4af9a7b934c1d2a98d /CMakeLists.txt | |
| parent | e9ef332ec409209626716da43ab8bb14651723b4 (diff) | |
| download | MultiMC-36499049741c15f7f26bc157128976d1d9a75319.tar MultiMC-36499049741c15f7f26bc157128976d1d9a75319.tar.gz MultiMC-36499049741c15f7f26bc157128976d1d9a75319.tar.lz MultiMC-36499049741c15f7f26bc157128976d1d9a75319.tar.xz MultiMC-36499049741c15f7f26bc157128976d1d9a75319.zip | |
Fixed CXX flags.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index edb58ef2..0cb80bbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,19 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON) # Output all executables and shared libs in the main build folder, not in subfolders. SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) +######## Set compiler flags ######## +IF(APPLE) + # assume clang 4.1.0+, add C++0x/C++11 stuff + message(STATUS "Using APPLE CMAKE_CXX_FLAGS") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++") +ELSEIF(UNIX) + # assume GCC, add C++0x/C++11 stuff + MESSAGE(STATUS "Using UNIX CMAKE_CXX_FLAGS") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") +ELSEIF(MINGW) + MESSAGE(STATUS "Using MINGW CMAKE_CXX_FLAGS") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x") +ENDIF() ################################ INCLUDE LIBRARIES ################################ @@ -73,21 +86,6 @@ ENDIF(${BIGENDIAN}) SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}") -######## Set compiler flags ######## -IF(APPLE) - # assume clang 4.1.0+, add C++0x/C++11 stuff - message(STATUS "Using APPLE CMAKE_CXX_FLAGS") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -stdlib=libc++") -ELSEIF(UNIX) - # assume GCC, add C++0x/C++11 stuff - MESSAGE(STATUS "Using UNIX CMAKE_CXX_FLAGS") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -ELSEIF(MINGW) - MESSAGE(STATUS "Using MINGW CMAKE_CXX_FLAGS") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x") -ENDIF() - - ######## Set version numbers ######## SET(MultiMC_VERSION_MAJOR 5) SET(MultiMC_VERSION_MINOR 0) |