diff --git a/moose-core/CheckCXXCompiler.cmake b/moose-core/CheckCXXCompiler.cmake index 7fddd1d2a2e27ccde9e15c778772758977e23b99..f54f7e00b1a97c1813f573ec895b9127ab5bdadc 100644 --- a/moose-core/CheckCXXCompiler.cmake +++ b/moose-core/CheckCXXCompiler.cmake @@ -5,8 +5,6 @@ CHECK_CXX_COMPILER_FLAG( "-std=c++11" COMPILER_SUPPORTS_CXX11 ) CHECK_CXX_COMPILER_FLAG( "-std=c++0x" COMPILER_SUPPORTS_CXX0X ) CHECK_CXX_COMPILER_FLAG( "-Wno-strict-aliasing" COMPILER_WARNS_STRICT_ALIASING ) - - # Turn warning to error: Not all of the options may be supported on all # versions of compilers. be careful here. add_definitions(-Wall @@ -32,11 +30,17 @@ if(COMPILER_SUPPORTS_CXX11) message(STATUS "Your compiler supports c++11 features. Enabling it") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") add_definitions( -DENABLE_CPP11 ) + if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++11" ) + endif(APPLE) elseif(COMPILER_SUPPORTS_CXX0X) message(STATUS "Your compiler supports c++0x features. Enabling it") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") add_definitions( -DENABLE_CXX11 ) add_definitions( -DBOOST_NO_CXX11_SCOPED_ENUMS -DBOOST_NO_SCOPED_ENUMS ) + if(APPLE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++11" ) + endif(APPLE) else() add_definitions( -DBOOST_NO_CXX11_SCOPED_ENUMS -DBOOST_NO_SCOPED_ENUMS ) message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support.")