Add dep libs to 'Libs' entry in libvalhalla.pc

Kashian · Jun 1, 2018 · db4ff57 · db4ff57
1 parent b960f91
commit db4ff57
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/cmake/PkgConfig.cmake b/cmake/PkgConfig.cmake
@@ -0,0 +1,3 @@
+string(REGEX REPLACE " [^ ]*valhalla[^ ]+" "" deplibs "${deplibs}")
+string(REGEX REPLACE " [^ ]*lib([^/ ]+).so" " -l\\1" deplibs "${deplibs}")
+configure_file(${INPUT} ${OUTPUT} @ONLY)
diff --git a/libvalhalla.pc.in b/libvalhalla.pc.in
@@ -6,5 +6,5 @@ includedir=${prefix}/@includedir@
 Name: libvalhalla
 Description: valhalla c++ library
 Version: @VERSION@
-Libs: -L${libdir} -lvalhalla
+Libs: -L${libdir} -lvalhalla @deplibs@
 Cflags: -I${includedir}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -236,13 +236,12 @@ install(FILES ${valhalla_hdrs}
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/valhalla"
   COMPONENT development)
 
-
 ## pkg-config file
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-set(libdir ${CMAKE_INSTALL_LIBDIR})
-set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
-configure_file(../libvalhalla.pc.in libvalhalla.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libvalhalla.pc
+set(CMAKE_PkgConfig_LINK_EXECUTABLE "<CMAKE_COMMAND> -DINPUT=${PROJECT_SOURCE_DIR}/libvalhalla.pc.in -DOUTPUT=<TARGET> -DVERSION=${VERSION} -Dprefix=${CMAKE_INSTALL_PREFIX} -Dexec_prefix=${CMAKE_INSTALL_PREFIX} -Dlibdir=${CMAKE_INSTALL_LIBDIR} -Dincludedir=${CMAKE_INSTALL_INCLUDEDIR} -Ddeplibs=\"<FLAGS> <LINK_FLAGS> <LINK_LIBRARIES>\" -P ${CMAKE_SOURCE_DIR}/cmake/PkgConfig.cmake")
+
+add_executable(libvalhalla.pc ../libvalhalla.pc.in)
+target_link_libraries(libvalhalla.pc valhalla)
+set_target_properties(libvalhalla.pc PROPERTIES LINKER_LANGUAGE PkgConfig)
+install(TARGETS libvalhalla.pc
   DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
   COMPONENT development)