Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep C++ standard flexible #248

Merged
merged 3 commits into from
Jun 15, 2024
Merged

Keep C++ standard flexible #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef26dd2
Keep C++ standard flexible
uilianries May 30, 2024
20e0a04
Use public cxx_standard
uilianries May 30, 2024
bfc1196
Enforce C++14 when building protobuf
uilianries Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ include_directories(${LIBLZMA_INCLUDE_DIRS})
find_package(ZLIB)
include_directories(${ZLIB_INCLUDE_DIRS})

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

include_directories(${PROJECT_SOURCE_DIR})

if (MSVC)
Expand Down
2 changes: 1 addition & 1 deletion cmake/external/protobuf.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ ExternalProject_Add(${PROTOBUF_TARGET}
-DCMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=${CMAKE_CXX_COMPILER_LAUNCHER}
-DCMAKE_C_FLAGS=${PROTOBUF_CFLAGS}
-DCMAKE_CXX_FLAGS=${PROTOBUF_CXXFLAGS}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DCMAKE_CXX_STANDARD=14
-Dprotobuf_BUILD_TESTS=OFF
BUILD_BYPRODUCTS ${PROTOBUF_BUILD_BYPRODUCTS}
)
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ target_link_libraries(protobuf-mutator
set_target_properties(protobuf-mutator PROPERTIES
COMPILE_FLAGS "${NO_FUZZING_FLAGS}"
SOVERSION 0)
target_compile_features(protobuf-mutator PUBLIC cxx_std_14)

if (LIB_PROTO_MUTATOR_TESTING)
protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS
Expand Down
1 change: 1 addition & 0 deletions src/libfuzzer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ target_link_libraries(protobuf-mutator-libfuzzer
set_target_properties(protobuf-mutator-libfuzzer PROPERTIES
COMPILE_FLAGS "${NO_FUZZING_FLAGS}"
SOVERSION 0)
target_compile_features(protobuf-mutator-libfuzzer PUBLIC cxx_std_14)

install(TARGETS protobuf-mutator-libfuzzer
EXPORT libprotobuf-mutatorTargets
Expand Down
Loading