Skip to content

CMake: fix absolute include install dir #702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nim65s wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CMake: fix absolute include install dir #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions install/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ endforeach()
# Install package config files
#

if(IS_ABSOLUTE CMAKE_INSTALL_INCLUDEDIR)
set(CMAKE_INSTALL_INCLUDEDIR_EXPORTS "${CMAKE_INSTALL_INCLUDEDIR}")
set(CMAKE_INSTALL_INCLUDEDIR_PC "${CMAKE_INSTALL_INCLUDEDIR}")
else()
set(CMAKE_INSTALL_INCLUDEDIR_EXPORTS "\${_IMPORT_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
set(CMAKE_INSTALL_INCLUDEDIR_PC "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
endif()

configure_file("${CMAKE_CURRENT_SOURCE_DIR}/zenohcxx.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/zenohcxx.pc" @ONLY)
if(APPLE OR UNIX)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zenohcxx.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" OPTIONAL COMPONENT dev)
Expand Down
6 changes: 3 additions & 3 deletions install/PackageConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ endif()

if(NOT TARGET zenohcxx)
add_library(zenohcxx INTERFACE IMPORTED)
target_include_directories(zenohcxx INTERFACE "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@")
target_include_directories(zenohcxx INTERFACE "@CMAKE_INSTALL_INCLUDEDIR_EXPORTS@")
endif()

# zenohcxx for zenohpico
if(TARGET zenohpico::lib AND NOT TARGET zenohcxx_zenohpico)
message(STATUS "defined lib target zenohcxx::zenohpico for zenohpico::lib")
add_library(zenohcxx_zenohpico INTERFACE IMPORTED)
target_compile_definitions(zenohcxx_zenohpico INTERFACE ZENOHCXX_ZENOHPICO)
target_include_directories(zenohcxx_zenohpico INTERFACE "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@")
target_include_directories(zenohcxx_zenohpico INTERFACE "@CMAKE_INSTALL_INCLUDEDIR_EXPORTS@")
add_dependencies(zenohcxx_zenohpico zenohpico::lib)
target_link_libraries(zenohcxx_zenohpico INTERFACE zenohpico::lib)
add_library(zenohcxx::zenohpico ALIAS zenohcxx_zenohpico)
Expand All @@ -44,7 +44,7 @@ if(TARGET zenohc::lib AND NOT TARGET zenohcxx_zenohc)
message(STATUS "defined lib target zenohcxx::zenohc for zenohc::lib")
add_library(zenohcxx_zenohc INTERFACE IMPORTED)
target_compile_definitions(zenohcxx_zenohc INTERFACE ZENOHCXX_ZENOHC)
target_include_directories(zenohcxx_zenohc INTERFACE "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@")
target_include_directories(zenohcxx_zenohc INTERFACE "@CMAKE_INSTALL_INCLUDEDIR_EXPORTS@")
add_dependencies(zenohcxx_zenohc zenohc::lib)
target_link_libraries(zenohcxx_zenohc INTERFACE zenohc::lib)
add_library(zenohcxx::zenohc ALIAS zenohcxx_zenohc)
Expand Down
2 changes: 1 addition & 1 deletion install/zenohcxx.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Name: @PROJECT_NAME@
Description: @CMAKE_PROJECT_DESCRIPTION@
URL: @CMAKE_PROJECT_HOMEPAGE_URL@
Version: @PROJECT_VERSION@
Cflags: -I${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
Cflags: -I@CMAKE_INSTALL_INCLUDEDIR_PC@
Loading