diff options
| author | Andrew <forkk@forkk.net> | 2013-02-14 22:41:45 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-02-14 22:41:45 -0600 |
| commit | f6a62d98aacf0d644d48e9abd781ef7d6fecaac8 (patch) | |
| tree | 8c031a9db665b53aa864c632eef5149d53b4e2d1 | |
| parent | 4b1680f2428f33dc8ecbf3f4f4b964b0a02e7e06 (diff) | |
| parent | 98b15ba02a9fc2170c0f98e3c5a1580367e96bbc (diff) | |
| download | MultiMC-f6a62d98aacf0d644d48e9abd781ef7d6fecaac8.tar MultiMC-f6a62d98aacf0d644d48e9abd781ef7d6fecaac8.tar.gz MultiMC-f6a62d98aacf0d644d48e9abd781ef7d6fecaac8.tar.lz MultiMC-f6a62d98aacf0d644d48e9abd781ef7d6fecaac8.tar.xz MultiMC-f6a62d98aacf0d644d48e9abd781ef7d6fecaac8.zip | |
Merge branch 'master' into inst_rewrite
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fcff14a..37ed383b 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() |