[osmpbf] 08/22: Fix building example and installation

Bas Couwenberg sebastic at xs4all.nl
Sun Mar 16 10:08:41 UTC 2014


This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to tag v1.3.1
in repository osmpbf.

commit 05772fdf5d0cfde34c87cfb42be484dde3621fb5
Author: Charlie Root <root at freebsd.vvtis>
Date:   Tue Jul 9 11:36:17 2013 +0600

    Fix building example and installation
---
 src/CMakeLists.txt   | 3 +--
 tools/CMakeLists.txt | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 82535df..16a4994 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,6 @@ ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD  COMMAND ${CMAKE_COMMAND} -E copy ${
 ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/osmformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf)
 
 SET(INCLUDE_INSTALL "include/osmpbf")
-FILE(GLOB files "${CMAKE_BINARY_DIR}/src/*.h")
+FILE(GLOB files "${CMAKE_SOURCE_DIR}/src/*.h")
 INSTALL(FILES ${files} DESTINATION ${INCLUDE_INSTALL})
-INSTALL(FILES "${CMAKE_SOURCE_DIR}/include/osmpbf/osmpbf.h" DESTINATION ${INCLUDE_INSTALL})
 install(TARGETS osmpbf LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 8f12706..0a14450 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -10,8 +10,7 @@ endif()
 SET(CPP_SRC osmpbf-outline.cpp)
 SET(HPP_SRC "")
 SET(C_SRC "")
-
-include_directories("${CAMKE_SRC_DIR}/include")
+include_directories("${CMAKE_SOURCE_DIR}/include")
 
 add_executable(${PROJECT} ${HPP_SRC} ${CPP_SRC} ${C_SRC})
 set_target_properties(${PROJECT} PROPERTIES LINKER_LANGUAGE CXX LANGUAGE CXX)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmpbf.git



More information about the Pkg-grass-devel mailing list