generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ChaiScript_5_0_CPP_11' of https://github.com/ChaiScript/ChaiScript into ChaiScript_5_0_CPP_11

Browse Source
This commit is contained in:
Jason Turner 2014-03-01 14:13:39 -07:00
commit 1f2c9b0c77
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -70,11 +70,25 @@ else(READLINE_LIBRARY)
set (READLINE_FLAG ) set (READLINE_FLAG )
endif(READLINE_LIBRARY) endif(READLINE_LIBRARY)
if (CMAKE_COMPILER_IS_GNUCC)
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
OUTPUT_VARIABLE GCC_VERSION)
if (GCC_VERSION VERSION_LESS 4.8)
SET(CPP11_FLAG "-std=c++0x")
else()
SET(CPP11_FLAG "-std=c++11")
endif()
else()
SET(CPP11_FLAG "-std=c++11")
endif()
if(MSVC) if(MSVC)
add_definitions(/W4) add_definitions(/W4)
add_definitions(/bigobj) add_definitions(/bigobj)
else() else()
add_definitions(-Wall -Wextra -Wshadow -pedantic -std=c++11) add_definitions(-Wall -Wextra -Wshadow -pedantic ${CPP11_FLAG})
if (APPLE) if (APPLE)
add_definitions(-Wno-sign-compare) add_definitions(-Wno-sign-compare)
@ -87,9 +101,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if (USE_LIBCXX) if (USE_LIBCXX)
add_definitions(-stdlib=libc++) add_definitions(-stdlib=libc++)
set (EXTRA_LINKER_FLAGS -std=c++11 -stdlib=libc++) set (EXTRA_LINKER_FLAGS ${CPP11_FLAG}-stdlib=libc++)
else () else ()
set (EXTRA_LINKER_FLAGS -std=c++11 ) set (EXTRA_LINKER_FLAGS ${CPP11_FLAG} )
endif() endif()
else() else()
set (EXTRA_LINKER_FLAGS ) set (EXTRA_LINKER_FLAGS )