From f134836309ea10f9110e9cd2a355e2165d84fd9c Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Tue, 4 Apr 2023 11:06:43 +0200 Subject: [PATCH] install rules added/fixed --- cmake/QskBuildFunctions.cmake | 4 ++++ qmlexport/CMakeLists.txt | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/QskBuildFunctions.cmake b/cmake/QskBuildFunctions.cmake index a0b1538e..36398c47 100644 --- a/cmake/QskBuildFunctions.cmake +++ b/cmake/QskBuildFunctions.cmake @@ -65,6 +65,10 @@ function(qsk_add_plugin target TYPE CLASS_NAME) set_target_properties( ${target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/plugins/${TYPE}") + install(TARGETS ${target} DESTINATION "plugins/${TYPE}" ) + set_target_properties(${target} PROPERTIES + INSTALL_RPATH "\${ORIGIN}/../../lib" ) + endfunction() function(qsk_add_example target) diff --git a/qmlexport/CMakeLists.txt b/qmlexport/CMakeLists.txt index 1d4d4b17..705ac03e 100644 --- a/qmlexport/CMakeLists.txt +++ b/qmlexport/CMakeLists.txt @@ -14,7 +14,8 @@ target_include_directories(${target} PUBLIC ${CMAKE_CURRENT_LIST_DIR}) set_target_properties(${target} PROPERTIES PUBLIC_HEADER QskQml.h) if(BUILD_QSKDLL) - set_target_properties( ${target} PROPERTIES DEFINE_SYMBOL QSK_QML_MAKEDLL ) + set_target_properties(${target} PROPERTIES DEFINE_SYMBOL QSK_QML_MAKEDLL) + set_target_properties(${target} PROPERTIES INSTALL_RPATH "\${ORIGIN}" ) endif() install(TARGETS ${target} )