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: Require C++20 for builds

Browse source
This commit is contained in:
Tim Wojtulewicz 2024-05-01 15:32:37 -07:00
parent bb382fc0c0
commit b9b4fcb78b
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tools/binpac/CMakeLists.txt
View file

@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR) cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR)
project(BinPAC C CXX) project(BinPAC C CXX)
include(cmake/CommonCMakeConfig.cmake) include(cmake/CommonCMakeConfig.cmake)
include(cmake/RequireCXXStd.cmake)
file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" BINPAC_VERSION LIMIT_COUNT 1) file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" BINPAC_VERSION LIMIT_COUNT 1)
string(REPLACE "." " " _version_numbers ${BINPAC_VERSION}) string(REPLACE "." " " _version_numbers ${BINPAC_VERSION})

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

@ -14,11 +14,9 @@ set(binpac_lib_SRCS binpac_buffer.cc binpac_bytestring.cc binpac_regex.cc ${binp
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( set_target_properties(
binpac_lib binpac_lib
PROPERTIES CXX_EXTENSIONS OFF PROPERTIES 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
OUTPUT_NAME binpac) OUTPUT_NAME binpac)
@ -27,8 +25,7 @@ endif ()
if (ENABLE_STATIC) if (ENABLE_STATIC)
add_library(binpac_static STATIC ${binpac_lib_SRCS}) add_library(binpac_static STATIC ${binpac_lib_SRCS})
target_compile_features(binpac_static PRIVATE cxx_std_17) set_target_properties(binpac_static PROPERTIES OUTPUT_NAME binpac)
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 ()

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

@ -99,9 +99,9 @@ set(binpac_SRCS
pac_varfield.h pac_varfield.h
pac_withinput.h) pac_withinput.h)
include(${PROJECT_SOURCE_DIR}/cmake/RequireCXXStd.cmake)
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 # If building separately from zeek, we need to add the libunistd subdirectory