diff options
| author | Andrew <forkk@forkk.net> | 2013-02-14 22:41:35 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-02-14 22:41:35 -0600 |
| commit | 98b15ba02a9fc2170c0f98e3c5a1580367e96bbc (patch) | |
| tree | 40da2fda41090c33d91fab93fab8eb866dfa055c | |
| parent | fe452e3ac96699d51d47ecdc43c58778b512d72a (diff) | |
| parent | bd0e4b76066505df54d3fa20082196447aa1271a (diff) | |
| download | MultiMC-98b15ba02a9fc2170c0f98e3c5a1580367e96bbc.tar MultiMC-98b15ba02a9fc2170c0f98e3c5a1580367e96bbc.tar.gz MultiMC-98b15ba02a9fc2170c0f98e3c5a1580367e96bbc.tar.lz MultiMC-98b15ba02a9fc2170c0f98e3c5a1580367e96bbc.tar.xz MultiMC-98b15ba02a9fc2170c0f98e3c5a1580367e96bbc.zip | |
Merge branch 'master' of 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 dbe86a83..2b916f87 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() |