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: Set installdirs using GNUInstallDirs module in CMake

Browse source
This commit is contained in:
Derek Ditch 2019-02-13 21:04:35 -06:00 • committed by Tim Wojtulewicz
parent 1d750aa164
commit 2da5fecc16
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tools/binpac/CMakeLists.txt
View file

@ -4,6 +4,9 @@ include(cmake/CommonCMakeConfig.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)
# Set default install paths
include(GNUInstallDirs)
######################################################################## ########################################################################
## Dependency Configuration ## Dependency Configuration

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

@ -29,13 +29,13 @@ add_library(binpac_lib STATIC ${binpac_lib_SRCS})
set_target_properties(binpac_lib PROPERTIES OUTPUT_NAME binpac) set_target_properties(binpac_lib PROPERTIES OUTPUT_NAME binpac)
install(TARGETS binpac_lib DESTINATION lib) install(TARGETS binpac_lib DESTINATION ${CMAKE_INSTALL_LIBDIR})
if ( BRO_ROOT_DIR ) if ( BRO_ROOT_DIR )
# Installed in binpac subdir just for organization purposes. # Installed in binpac subdir just for organization purposes.
install(FILES ${binpac_headers} DESTINATION include/binpac) install(FILES ${binpac_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/binpac)
else () else ()
install(FILES ${binpac_headers} DESTINATION include) install(FILES ${binpac_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
endif () endif ()
# This is set to assist superprojects that want to build BinPac # This is set to assist superprojects that want to build BinPac