diff --git a/CMakeLists.txt b/CMakeLists.txt index 0263928..4abf1e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ PROJECT(OSMBinary) cmake_minimum_required(VERSION 2.8.5) +SET(OSMPBF_VERSION "1.3.3") + SET(SEARCH_PREFIX CACHE PATH "Additional prefix to search libraries (Protobuf etc.)" ) SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${SEARCH_PREFIX}) @@ -12,4 +14,4 @@ include_directories(${PROTOBUF_INCLUDE_DIR}) add_subdirectory(src) if(NOT MSVC) add_subdirectory(tools) -endif() \ No newline at end of file +endif() diff --git a/src/Makefile b/src/Makefile index e7557a2..9282085 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,7 +32,7 @@ libosmpbf.so: fileformat.pb.o osmformat.pb.o # The placeholder for the installation prefix is '@CMAKE_INSTALL_PREFIX@'. # Do not change that, it would only make the CMakeLists.txt file which does # the same job as below line more complex. - sed -e 's!@CMAKE_INSTALL_PREFIX@!'$(PREFIX)'!g' <$< >$@ + sed -e 's!@CMAKE_INSTALL_PREFIX@!'$(PREFIX)'!g;s!@OSMPBF_VERSION@!'$(VERSION)'!g' <$< >$@ install: install -m 755 -d $(DESTDIR)$(LIBDIR) diff --git a/src/OsmpbfConfig.cmake.in b/src/OsmpbfConfig.cmake.in index 7891729..3e62c8e 100644 --- a/src/OsmpbfConfig.cmake.in +++ b/src/OsmpbfConfig.cmake.in @@ -1,2 +1,3 @@ set(OSMPBF_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include/osmpbf") set(OSMPBF_LIBRARIES "@CMAKE_INSTALL_PREFIX@/lib/libosmpbf.so") +set(OSMPBF_VERSION "@OSMPBF_VERSION@")