diff --git a/CMakeLists.txt b/CMakeLists.txt index a8277a7..7ecad26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) +set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin) diff --git a/cmake_modules/Findaasdk.cmake b/cmake_modules/Findaasdk.cmake index cb3721f..4fb8614 100644 --- a/cmake_modules/Findaasdk.cmake +++ b/cmake_modules/Findaasdk.cmake @@ -25,11 +25,13 @@ if (AASDK_FOUND) if (NOT aasdk_FIND_QUIETLY) message(STATUS "Found aasdk:") message(STATUS " - Includes: ${AASDK_INCLUDE_DIR}") - message(STATUS " - Libraries: ${AASDK_LIBRARIES}") + message(STATUS " - Includes: ${AASDK_PROTO_INCLUDE_DIR}") + message(STATUS " - Libraries: ${AASDK_LIB_DIR}") endif() add_library(aasdk INTERFACE) target_include_directories(aasdk INTERFACE ${AASDK_INCLUDE_DIR} ${AASDK_PROTO_INCLUDE_DIR}) - target_link_libraries(aasdk INTERFACE ${AASDK_LIB_DIR}/libaasdk.so ${AASDK_LIB_DIR}/libaasdk_proto.so) + set_target_properties(aasdk PROPERTIES INTERFACE_LINK_DIRECTORIES ${AASDK_LIB_DIR}) + target_link_libraries(aasdk INTERFACE libaasdk.so libaasdk_proto.so) else() if (aasdk_FIND_REQUIRED) if(AASDK_INCLUDE_DIR AND NOT AASDK_PROTO_INCLUDE_DIR) diff --git a/openauto/CMakeLists.txt b/openauto/CMakeLists.txt index 880e430..cca1b1b 100644 --- a/openauto/CMakeLists.txt +++ b/openauto/CMakeLists.txt @@ -110,5 +110,8 @@ target_link_libraries(openauto PUBLIC install(TARGETS openauto LIBRARY DESTINATION lib) +set_target_properties(openauto + PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/openauto DESTINATION include) install(FILES ${CMAKE_SOURCE_DIR}/include/OpenautoLog.hpp DESTINATION include)