Skip to content

Commit

Permalink
update(cmake): Install libraries into CMAKE_INSTALL_LIBDIR
Browse files Browse the repository at this point in the history
Install libraries into CMAKE_INSTALL_LIBDIR. This appears to be more
compliant with the FHS[1] and simplifies linking when BUILD_SHARED_LIBS
is enabled.

[1] https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s06.html

Signed-off-by: Gerald Combs <gerald@wireshark.org>
  • Loading branch information
geraldcombs committed May 17, 2023
1 parent 5e30689 commit 4c5746a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 12 deletions.
6 changes: 1 addition & 5 deletions cmake/modules/libscap.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,7 @@ foreach(libscap_conditional_lib ${libscap_conditional_libs})
endif()
endforeach()

install(TARGETS ${LIBSCAP_LIBS}
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/${LIBS_PACKAGE_NAME}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/${LIBS_PACKAGE_NAME}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
COMPONENT "scap" OPTIONAL)
install(TARGETS ${LIBSCAP_LIBS} COMPONENT "scap" OPTIONAL)
install(DIRECTORY "${LIBSCAP_INCLUDE_DIR}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}/userspace"
COMPONENT "scap"
FILES_MATCHING PATTERN "*.h"
Expand Down
6 changes: 1 addition & 5 deletions cmake/modules/libsinsp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,7 @@ function(set_sinsp_target_properties target)
endfunction()

add_subdirectory(${LIBSINSP_DIR}/userspace/libsinsp ${CMAKE_BINARY_DIR}/libsinsp)
install(TARGETS sinsp
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/${LIBS_PACKAGE_NAME}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/${LIBS_PACKAGE_NAME}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
COMPONENT "sinsp")
install(TARGETS sinsp COMPONENT "sinsp")
install(DIRECTORY "${LIBSINSP_DIR}/userspace/libsinsp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBS_PACKAGE_NAME}/userspace"
COMPONENT "sinsp"
FILES_MATCHING PATTERN "*.h"
Expand Down
2 changes: 1 addition & 1 deletion userspace/libscap/libscap.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ Name: libscap
Description: lib for System CAPture
Version: @FALCOSECURITY_LIBS_VERSION@

Libs: -L${libdir}/@LIBS_PACKAGE_NAME@ -lscap -lscap_error -lscap_platform @SCAP_LINK_LIBRARIES_FLAGS@
Libs: -L${libdir} -lscap -lscap_error -lscap_platform @SCAP_LINK_LIBRARIES_FLAGS@
Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/userspace/libscap
2 changes: 1 addition & 1 deletion userspace/libsinsp/libsinsp.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Description: lib for System INSPection
Version: @FALCOSECURITY_LIBS_VERSION@

Requires: libscap
Libs: -L${libdir}/@LIBS_PACKAGE_NAME@ -lsinsp @SINSP_PKG_CONFIG_LIBDIRS@ @SINSP_PKG_CONFIG_LIBS@
Libs: -L${libdir} -lsinsp @SINSP_PKG_CONFIG_LIBDIRS@ @SINSP_PKG_CONFIG_LIBS@
Cflags: -I${includedir}/@LIBS_PACKAGE_NAME@/userspace/libsinsp @SINSP_PKG_CONFIG_INCLUDES@

0 comments on commit 4c5746a

Please sign in to comment.