natas_hw
/
OSM-binary
mirror of https://github.com/openstreetmap/OSM-binary
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More compilation fixes

This commit is contained in:
alex85k 2013-07-22 23:13:26 +06:00
parent 05772fdf5d
commit 1078fd47f3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -10,4 +10,6 @@ find_package(Protobuf REQUIRED)
include_directories(${PROTOBUF_INCLUDE_DIR})
add_subdirectory(src)
add_subdirectory(tools)
if(NOT MSVC)
add_subdirectory(tools)
endif()

2
src/CMakeLists.txt
View File

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