[osmpbf] 07/22: Fix CMake scripts

[Bas Couwenberg]

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 a06d895f63a0d5648beaa279bd07e9238ec88fec
Author: alex85k <alexei_kasatkin at mail.ru>
Date:   Thu Jun 13 22:51:02 2013 +0600

    Fix CMake scripts
---
 src/CMakeLists.txt   | 7 +++++--
 tools/CMakeLists.txt | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2124cf0..82535df 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,8 +10,11 @@ add_library(osmpbf STATIC ${CPPS})
 
 set_target_properties(osmpbf PROPERTIES LINKER_LANGUAGE CXX LANGUAGE CXX)
 
+ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/fileformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf)
+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_CURRENT_SOURCE_DIR}/*.h")
+FILE(GLOB files "${CMAKE_BINARY_DIR}/src/*.h")
 INSTALL(FILES ${files} DESTINATION ${INCLUDE_INSTALL})
-INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../include/osmpbf/osmpbf.h" 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 bf6b28f..8f12706 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -11,6 +11,8 @@ SET(CPP_SRC osmpbf-outline.cpp)
 SET(HPP_SRC "")
 SET(C_SRC "")
 
+include_directories("${CAMKE_SRC_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