diff options
| author | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-02-18 17:08:18 +0100 |
|---|---|---|
| committer | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-02-18 17:08:18 +0100 |
| commit | cf0e78b46dbd740caac9288f3fe5ef5d99ed2ce9 (patch) | |
| tree | 67af81fe5b013146bd30339eb8902dd513cf88ca | |
| parent | 369b1c55c99aa8bdcd2d57ab4aad3633343f1417 (diff) | |
| parent | bd0e4b76066505df54d3fa20082196447aa1271a (diff) | |
| download | MultiMC-cf0e78b46dbd740caac9288f3fe5ef5d99ed2ce9.tar MultiMC-cf0e78b46dbd740caac9288f3fe5ef5d99ed2ce9.tar.gz MultiMC-cf0e78b46dbd740caac9288f3fe5ef5d99ed2ce9.tar.lz MultiMC-cf0e78b46dbd740caac9288f3fe5ef5d99ed2ce9.tar.xz MultiMC-cf0e78b46dbd740caac9288f3fe5ef5d99ed2ce9.zip | |
Merge branch 'master' of http://github.com/Forkk/MultiMC5
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 95a16f60..9c8f7090 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,10 +35,16 @@ include_directories(patchlib) # add the java launcher add_subdirectory(launcher) -IF(UNIX) +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() |