From e5de634ce206d746cfad26a166ca6bd0495a95e8 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Sun, 3 Jan 2021 15:26:14 +0100 Subject: [PATCH] Set destination for installs explicitly Apparently not setting this doesn't work on older versions of CMake. --- src/CMakeLists.txt | 4 ++-- tools/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4bdd021..e58623c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,13 +2,13 @@ protobuf_generate_cpp(CPPS HS fileformat.proto osmformat.proto) add_library(osmpbf STATIC ${CPPS}) target_include_directories(osmpbf SYSTEM PUBLIC ${Protobuf_INCLUDE_DIRS}) -install(TARGETS osmpbf ARCHIVE) +install(TARGETS osmpbf ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) add_library(osmpbf_shared SHARED ${CPPS}) target_link_libraries(osmpbf_shared PRIVATE protobuf::libprotobuf) target_include_directories(osmpbf_shared SYSTEM PUBLIC ${Protobuf_INCLUDE_DIRS}) set_target_properties(osmpbf_shared PROPERTIES OUTPUT_NAME osmpbf) -install(TARGETS osmpbf_shared LIBRARY) +install(TARGETS osmpbf_shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${CMAKE_SOURCE_DIR}/include/osmpbf/osmpbf.h ${CMAKE_BINARY_DIR}/osmpbf/osmformat.pb.h diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index b1a1902..e1e2c6c 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -11,5 +11,5 @@ add_executable(osmpbf-outline osmpbf-outline.cpp) target_include_directories(osmpbf-outline SYSTEM PRIVATE ${ZLIB_INCLUDE_DIR}) target_link_libraries(osmpbf-outline PRIVATE osmpbf ZLIB::ZLIB protobuf::libprotobuf) -install(TARGETS osmpbf-outline RUNTIME) +install(TARGETS osmpbf-outline RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) install(FILES osmpbf-outline.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)