summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Okin <forkk@forkk.net>2013-02-14 20:41:03 -0800
committerAndrew Okin <forkk@forkk.net>2013-02-14 20:41:03 -0800
commitbd0e4b76066505df54d3fa20082196447aa1271a (patch)
tree42a310a6738d74248aa51103d58dd0eacb6b5967
parentd1b1d7e800173cb0e165babc625ddab03ea7e653 (diff)
parentb7120b293e3d50345d659fa267e376896a494b59 (diff)
downloadMultiMC-bd0e4b76066505df54d3fa20082196447aa1271a.tar
MultiMC-bd0e4b76066505df54d3fa20082196447aa1271a.tar.gz
MultiMC-bd0e4b76066505df54d3fa20082196447aa1271a.tar.lz
MultiMC-bd0e4b76066505df54d3fa20082196447aa1271a.tar.xz
MultiMC-bd0e4b76066505df54d3fa20082196447aa1271a.zip
Merge pull request #1 from mortu/master
Successfully build using clang 4.1 on OSX
-rw-r--r--CMakeLists.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a191ea6b..f1caf516 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()