Commit 60e92894 authored by Jan Möbius's avatar Jan Möbius

Removed the c++11 part. does not seem to work correctly

git-svn-id: http://www.openvolumemesh.org/svnrepo/OpenVolumeMesh/trunk@274 66977474-1d4b-4f09-8fe9-267525286df2
parent 78829ac2
...@@ -153,25 +153,25 @@ if (UNIX) ...@@ -153,25 +153,25 @@ if (UNIX)
################################################################################ ################################################################################
# On apple, if we have c++ 11 support, we enable it automatically here # On apple, if we have c++ 11 support, we enable it automatically here
if (APPLE) # if (APPLE)
#
include(CheckCXXCompilerFlag) # include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) # CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) # CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
#
if(COMPILER_SUPPORTS_CXX11) # if(COMPILER_SUPPORTS_CXX11)
set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") # set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11")
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") # set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11")
set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") # set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11")
elseif(COMPILER_SUPPORTS_CXX0X) # elseif(COMPILER_SUPPORTS_CXX0X)
set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x") # set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x")
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x") # set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x")
set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x") # set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x")
else() # else()
message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Falling back to non C++11 mode. If you encounter errors, please use a different C++ compiler.") # message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Falling back to non C++11 mode. If you encounter errors, please use a different C++ compiler.")
endif() # endif()
#
endif() # endif()
endif () endif ()
...@@ -33,18 +33,6 @@ if(GTEST_FOUND) ...@@ -33,18 +33,6 @@ if(GTEST_FOUND)
if ( NOT WIN32 ) if ( NOT WIN32 )
set (TMP_FLAGS "-Wall -Wextra -Wuninitialized -Wunused -g -pedantic -ansi -Wno-long-long") set (TMP_FLAGS "-Wall -Wextra -Wuninitialized -Wunused -g -pedantic -ansi -Wno-long-long")
if ( APPLE )
include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
if(COMPILER_SUPPORTS_CXX11)
set( TMP_FLAGS "${TMP_FLAGS} -std=c++11")
elseif(COMPILER_SUPPORTS_CXX0X)
set( TMP_FLAGS "${TMP_FLAGS} -std=c++0x")
endif()
endif()
# Set compiler flags # Set compiler flags
set_target_properties(unittests PROPERTIES COMPILE_FLAGS "${TMP_FLAGS}") set_target_properties(unittests PROPERTIES COMPILE_FLAGS "${TMP_FLAGS}")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment