Skip to content

Commit 3b28530

Browse files
committed
Switch to c++14
1 parent c390388 commit 3b28530

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ include_directories(${LIBLZMA_INCLUDE_DIRS})
4242
find_package(ZLIB)
4343
include_directories(${ZLIB_INCLUDE_DIRS})
4444

45-
set(CMAKE_CXX_STANDARD 17)
45+
set(CMAKE_CXX_STANDARD 14)
4646
set(CMAKE_CXX_STANDARD_REQUIRED ON)
4747
set(CMAKE_CXX_EXTENSIONS OFF)
4848

cmake/external/protobuf.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ ExternalProject_Add(${PROTOBUF_TARGET}
165165
-DCMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=${CMAKE_CXX_COMPILER_LAUNCHER}
166166
-DCMAKE_C_FLAGS=${PROTOBUF_CFLAGS}
167167
-DCMAKE_CXX_FLAGS=${PROTOBUF_CXXFLAGS}
168+
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
168169
-Dprotobuf_BUILD_TESTS=OFF
169170
BUILD_BYPRODUCTS ${PROTOBUF_BUILD_BYPRODUCTS}
170171
)

0 commit comments

Comments
 (0)