Fix building example and installation

This commit is contained in:
Charlie Root 2013-07-09 11:36:17 +06:00
parent a06d895f63
commit 05772fdf5d
2 changed files with 2 additions and 4 deletions

View File

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

View File

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