Skip to content

Respect relative/absolute CMAKE_INSTALL_INCLUDEDIR #209

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
r-burns wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −7
Open

Respect relative/absolute CMAKE_INSTALL_INCLUDEDIR #209

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
5 changes: 2 additions & 3 deletions cmake/libappimage.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
# Use prefix as base path to make the package relocatable
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
libdir=@CMAKE_INSTALL_REL_LIBDIR@
includedir=@CMAKE_INSTALL_REL_INCLUDEDIR@

Name: @PROJECT_NAME@
Description: AppImage management and desktop integration
Expand Down
2 changes: 1 addition & 1 deletion cmake/scripts.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,6 @@ function(configure_libappimage_module target)
target_include_directories(${target}
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>
PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/libappimage>
INTERFACE $<INSTALL_INTERFACE:include/>
INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/>
)
endfunction()
11 changes: 11 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@ install(

if(NOT LIBAPPIMAGE_SHARED_ONLY)
# pkg-config
# Use prefix as base path to make the package relocatable, when possible
if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
set(CMAKE_INSTALL_REL_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
else()
set(CMAKE_INSTALL_REL_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
endif()
if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
set(CMAKE_INSTALL_REL_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
else()
set(CMAKE_INSTALL_REL_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
endif()
configure_file("${PROJECT_SOURCE_DIR}/cmake/libappimage.pc.in" "${PROJECT_BINARY_DIR}/libappimage.pc" @ONLY)

install(FILES "${PROJECT_BINARY_DIR}/libappimage.pc"
Expand Down
4 changes: 2 additions & 2 deletions src/libappimage/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ install(
# install public headers
install(
DIRECTORY ${PROJECT_SOURCE_DIR}/include/appimage/
DESTINATION include/appimage
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/appimage"
COMPONENT libappimage-dev
)

install(
DIRECTORY ${PROJECT_BINARY_DIR}/generated-headers/appimage/
DESTINATION include/appimage
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/appimage"
COMPONENT libappimage-dev
)

Expand Down
2 changes: 1 addition & 1 deletion src/libappimage_shared/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ add_library(libappimage_shared STATIC
set_target_properties(libappimage_shared PROPERTIES PREFIX "")
target_include_directories(libappimage_shared PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
set_property(TARGET libappimage_shared PROPERTY PUBLIC_HEADER ${libappimage_shared_public_header})
target_link_libraries(libappimage_shared PRIVATE libappimage_hashlib)
Expand Down