Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

binpac: Force -std=c++17 mode for cmake targets, remove use of RequireCXX17.cmake

Browse source
This commit is contained in:
Tim Wojtulewicz 2023-06-15 11:45:13 -07:00
parent b7cc5afa78
commit 874de5d25b
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tools/binpac/lib/CMakeLists.txt
View file

@ -27,7 +27,9 @@ set(binpac_lib_SRCS
if ( ENABLE_SHARED ) if ( ENABLE_SHARED )
add_library(binpac_lib SHARED ${binpac_lib_SRCS}) add_library(binpac_lib SHARED ${binpac_lib_SRCS})
target_compile_features(binpac_lib PRIVATE cxx_std_17)
set_target_properties(binpac_lib PROPERTIES set_target_properties(binpac_lib PROPERTIES
CXX_EXTENSIONS OFF
SOVERSION ${BINPAC_SOVERSION} SOVERSION ${BINPAC_SOVERSION}
VERSION ${BINPAC_VERSION_MAJOR}.${BINPAC_VERSION_MINOR} VERSION ${BINPAC_VERSION_MAJOR}.${BINPAC_VERSION_MINOR}
MACOSX_RPATH true MACOSX_RPATH true
@ -37,7 +39,10 @@ endif ()
if ( ENABLE_STATIC ) if ( ENABLE_STATIC )
add_library(binpac_static STATIC ${binpac_lib_SRCS}) 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}) install(TARGETS binpac_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif () endif ()

3
tools/binpac/src/CMakeLists.txt
View file

@ -8,7 +8,6 @@ if (MSVC)
else() else()
set_property(SOURCE pac_scan.cc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-sign-compare") set_property(SOURCE pac_scan.cc APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-sign-compare")
endif() endif()
include(RequireCXX17)
include_directories(${PROJECT_SOURCE_DIR}/src include_directories(${PROJECT_SOURCE_DIR}/src
${PROJECT_BINARY_DIR}/src) ${PROJECT_BINARY_DIR}/src)
@ -103,6 +102,8 @@ set(binpac_SRCS
) )
add_executable(binpac ${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 ( MSVC )
# If building separately from zeek, we need to add the libunistd subdirectory so # If building separately from zeek, we need to add the libunistd subdirectory so