Skip to content

Commit b773253

Browse files
authored
Merge pull request #341 from akien-mga/fix-pkgconfig
pkgconfig: Fix support for absolute lib and include dirs
2 parents f521e21 + a1472c6 commit b773253

1 file changed

Lines changed: 14 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,22 +279,31 @@ endif()
279279
# .so version
280280
set_property(TARGET lcf PROPERTY SOVERSION 0)
281281

282+
# installation
283+
include(GNUInstallDirs)
284+
282285
# pkg-config file generation
286+
set(LCF_LIBDIR ${CMAKE_INSTALL_LIBDIR})
287+
if(IS_ABSOLUTE ${LCF_LIBDIR})
288+
file(RELATIVE_PATH LCF_LIBDIR ${CMAKE_INSTALL_PREFIX} ${LCF_LIBDIR})
289+
endif()
290+
set(LCF_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
291+
if(IS_ABSOLUTE ${LCF_INCLUDEDIR})
292+
file(RELATIVE_PATH LCF_INCLUDEDIR ${CMAKE_INSTALL_PREFIX} ${LCF_INCLUDEDIR})
293+
endif()
294+
283295
set(PACKAGE_TARNAME ${PROJECT_NAME})
284296
set(PACKAGE_VERSION ${PROJECT_VERSION})
285297
set(prefix "${CMAKE_INSTALL_PREFIX}")
286298
set(exec_prefix "\${prefix}")
287-
set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
288-
set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
299+
set(libdir "\${exec_prefix}/${LCF_LIBDIR}")
300+
set(includedir "\${prefix}/${LCF_INCLUDEDIR}")
289301
string(REPLACE ";" " " AX_PACKAGE_REQUIRES_PRIVATE "${LIBLCF_DEPS}")
290302
configure_file(builds/${PROJECT_NAME}.pc.in builds/${PROJECT_NAME}.pc @ONLY)
291303

292304
# Cmake-config file generation
293305
configure_file(builds/${PROJECT_NAME}-config.cmake.in builds/${PROJECT_NAME}-config.cmake @ONLY)
294306

295-
# installation
296-
include(GNUInstallDirs)
297-
298307
install(
299308
TARGETS lcf
300309
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

0 commit comments

Comments
 (0)