summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormortu <wade.christopher+mortu@gmail.com>2013-02-12 13:50:45 -0600
committermortu <wade.christopher+mortu@gmail.com>2013-02-12 13:50:45 -0600
commitb7120b293e3d50345d659fa267e376896a494b59 (patch)
treeccc786a009d2aca62a98666cf356a4961c59a08f
parent5f8784a62e642e7c79c5dfd94da57d755db2fee3 (diff)
downloadMultiMC-b7120b293e3d50345d659fa267e376896a494b59.tar
MultiMC-b7120b293e3d50345d659fa267e376896a494b59.tar.gz
MultiMC-b7120b293e3d50345d659fa267e376896a494b59.tar.lz
MultiMC-b7120b293e3d50345d659fa267e376896a494b59.tar.xz
MultiMC-b7120b293e3d50345d659fa267e376896a494b59.zip
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 877a9699..71c11a27 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()