Adding version number to appear in OsmpbfConfig.cmake

This commit is contained in:
Thomas Fischer 2016-01-29 10:52:11 +01:00
parent cc746aedf3
commit fbec2196e0
3 changed files with 5 additions and 2 deletions

View File

@ -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()
endif()

View File

@ -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)

View File

@ -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@")