diff --git a/tools/binpac/lib/CMakeLists.txt b/tools/binpac/lib/CMakeLists.txt index d79b3f38b1..219018edb6 100644 --- a/tools/binpac/lib/CMakeLists.txt +++ b/tools/binpac/lib/CMakeLists.txt @@ -27,7 +27,9 @@ set(binpac_lib_SRCS if ( ENABLE_SHARED ) add_library(binpac_lib SHARED ${binpac_lib_SRCS}) + target_compile_features(binpac_lib PRIVATE cxx_std_17) set_target_properties(binpac_lib PROPERTIES + CXX_EXTENSIONS OFF SOVERSION ${BINPAC_SOVERSION} VERSION ${BINPAC_VERSION_MAJOR}.${BINPAC_VERSION_MINOR} MACOSX_RPATH true @@ -37,7 +39,10 @@ endif () if ( ENABLE_STATIC ) add_library(binpac_static STATIC ${binpac_lib_SRCS}) - set_target_properties(binpac_static PROPERTIES OUTPUT_NAME binpac) + target_compile_features(binpac_static PRIVATE cxx_std_17) + set_target_properties(binpac_static PROPERTIES + CXX_EXTENSIONS OFF + OUTPUT_NAME binpac) install(TARGETS binpac_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif () diff --git a/tools/binpac/src/CMakeLists.txt b/tools/binpac/src/CMakeLists.txt index f1a3068b8c..1cfb83f505 100644 --- a/tools/binpac/src/CMakeLists.txt +++ b/tools/binpac/src/CMakeLists.txt @@ -8,7 +8,6 @@ if (MSVC) else() set_property(SOURCE pac_scan.cc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-sign-compare") endif() -include(RequireCXX17) include_directories(${PROJECT_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src) @@ -103,6 +102,8 @@ set(binpac_SRCS ) add_executable(binpac ${binpac_SRCS}) +target_compile_features(binpac PRIVATE cxx_std_17) +set_target_properties(binpac PROPERTIES CXX_EXTENSIONS OFF) if ( MSVC ) # If building separately from zeek, we need to add the libunistd subdirectory so