From bf9b320537785e2037b441d5d9dc0fb8e707f37e Mon Sep 17 00:00:00 2001 From: Thomas Fischer Date: Fri, 29 Jan 2016 11:00:18 +0100 Subject: [PATCH] Install PkgConfig file Similarly to previous commits which generate .cmake files to locate this library from within CMakeLists.txt files, this commit provides a PkgConfig file (osmpbf.pc) for similar configuration/compilation- time information. --- src/CMakeLists.txt | 3 +++ src/Makefile | 4 +++- src/osmpbf.pc.in | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/osmpbf.pc.in diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9923de5..0022ecc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,3 +20,6 @@ install(TARGETS osmpbf LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) configure_file("OsmpbfConfig.cmake.in" "OsmpbfConfig.cmake" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/OsmpbfConfig.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/Osmpbf/) + +configure_file("osmpbf.pc.in" "osmpbf.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/osmpbf.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/) diff --git a/src/Makefile b/src/Makefile index 9282085..2b1d417 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,7 +13,7 @@ CXXFLAGS += -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -W .PHONY: clean install -all: libosmpbf.a libosmpbf.so ../include/osmpbf/fileformat.pb.h ../include/osmpbf/osmformat.pb.h OsmpbfConfig.cmake +all: libosmpbf.a libosmpbf.so ../include/osmpbf/fileformat.pb.h ../include/osmpbf/osmformat.pb.h OsmpbfConfig.cmake osmpbf.pc libosmpbf.a: fileformat.pb.o osmformat.pb.o $(AR) -cr $@ fileformat.pb.o osmformat.pb.o @@ -46,6 +46,8 @@ install: install -m 644 ../include/osmpbf/osmformat.pb.h $(DESTDIR)$(PREFIX)/include/osmpbf install -m 755 -d $(DESTDIR)$(PREFIX)/lib/cmake/Osmpbf install -m 644 OsmpbfConfig.cmake $(DESTDIR)$(PREFIX)/lib/cmake/Osmpbf + install -m 755 -d $(DESTDIR)$(PREFIX)/lib/pkgconfig + install -m 644 osmpbf.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig clean: rm -f *.pb.h *.pb.cc *.pb.o libosmpbf.a OsmpbfConfig.cmake diff --git a/src/osmpbf.pc.in b/src/osmpbf.pc.in new file mode 100644 index 0000000..9a936eb --- /dev/null +++ b/src/osmpbf.pc.in @@ -0,0 +1,10 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: OSM-Library +Description: Java/C library to read and write OpenStreetMap PBF files +Version: @OSMPBF_VERSION@ +Libs: -L${libdir} -losmpbf +Cflags: -I${includedir}