8000 Allow compiling against C++17 · ChaiScript/ChaiScript_Extras@ffbd6c4 · GitHub
[go: up one dir, main page]
Skip to content

Commit ffbd6c4

Browse files
lefticuslefticus
committed
Allow compiling against C++17
1 parent 7096eb7 commit ffbd6c4

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

‎CMakeLists.txt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ else()
1313
option(MULTITHREAD_SUPPORT_ENABLED "Multithreaded Support Enabled" TRUE)
1414
endif()
1515

16+
option(BUILD_IN_CPP17_MODE "Build with C++17 flags" FALSE)
1617

1718

1819
if(CMAKE_COMPILER_IS_GNUCC)
@@ -80,13 +81,21 @@ enable_testing()
8081
if(CMAKE_COMPILER_IS_GNUCC)
8182
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
8283

83-
if(GCC_VERSION VERSION_LESS 5.0)
84+
if(GCC_VERSION VERSION_LESS 4.9)
8485
set(CPP14_FLAG "-std=c++1y")
8586
else()
86-
set(CPP14_FLAG "-std=c++14")
87+
if (BUILD_IN_CPP17_MODE)
88+
set(CPP14_FLAG "-std=c++1z")
89+
else()
90+
set(CPP14_FLAG "-std=c++14")
91+
endif()
8792
endif()
8893
else()
89-
set(CPP14_FLAG "-std=c++14")
94+
if (BUILD_IN_CPP17_MODE)
95+
set(CPP14_FLAG "-std=c++1z")
96+
else()
97+
set(CPP14_FLAG "-std=c++14")
98+
endif()
9099
endif()
91100

92101
if(MSVC)
@@ -170,7 +179,7 @@ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
170179

171180

172181

173-
set(CHAISCRIPT_BRANCH master)
182+
set(CHAISCRIPT_BRANCH develop)
174183

175184
file(DOWNLOAD https://github.com/ChaiScript/ChaiScript/archive/${CHAISCRIPT_BRANCH}.tar.gz "${CMAKE_BINARY_DIR}/chaiscript/chaiscript-${CHAISCRIPT_BRANCH}.tar.gz"
176185
INACTIVITY_TIMEOUT 180 TIMEOUT 180 TLS_VERIFY off)

0 commit comments

Comments
 (0)
0