[osmpbf] 09/22: More compilation fixes

[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 1078fd47f32c91715eedefc8664b8da49b6a2656
Author: alex85k <alexei_kasatkin at mail.ru>
Date:   Mon Jul 22 23:13:26 2013 +0600

    More compilation fixes
---
 CMakeLists.txt     | 4 +++-
 src/CMakeLists.txt | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1015b9d..0263928 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,4 +10,6 @@ find_package(Protobuf REQUIRED)
 include_directories(${PROTOBUF_INCLUDE_DIR})
 
 add_subdirectory(src)
-add_subdirectory(tools)
\ No newline at end of file
+if(NOT MSVC)
+add_subdirectory(tools)
+endif()
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 16a4994..a2334c9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,6 +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_SOURCE_DIR}/src/*.h")
+FILE(GLOB files "${CMAKE_SOURCE_DIR}/include/osmpbf/*.h")
 INSTALL(FILES ${files} DESTINATION ${INCLUDE_INSTALL})
 install(TARGETS osmpbf LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)

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