From 49836345683bb4bf859ddd5214b2abea2521dcd1 Mon Sep 17 00:00:00 2001
From: Alexander Kavon <hawk@alexkavon.com>
Date: Thu, 21 Dec 2023 02:43:22 -0500
Subject: [PATCH] updated cmake install() destinations

---
 cmake/QskBuildFunctions.cmake | 2 +-
 qmlexport/CMakeLists.txt      | 4 +++-
 src/CMakeLists.txt            | 6 +++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cmake/QskBuildFunctions.cmake b/cmake/QskBuildFunctions.cmake
index 38fee091..11de4bf2 100644
--- a/cmake/QskBuildFunctions.cmake
+++ b/cmake/QskBuildFunctions.cmake
@@ -65,7 +65,7 @@ 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}" )
+    install(TARGETS ${target} DESTINATION "${CMAKE_INSTALL_LIBDIR}/qskinny/plugins/${TYPE}" )
     set_target_properties(${target} PROPERTIES
         INSTALL_RPATH "\${ORIGIN}/../../lib" )
 
diff --git a/qmlexport/CMakeLists.txt b/qmlexport/CMakeLists.txt
index ef245952..d59ad5b4 100644
--- a/qmlexport/CMakeLists.txt
+++ b/qmlexport/CMakeLists.txt
@@ -22,4 +22,6 @@ endif()
 
 set_target_properties(${target} PROPERTIES FOLDER libs)
 
-install(TARGETS ${target} )
+install(TARGETS ${target}
+    PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${target}"
+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3906ad94..f8e9ee0c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -514,4 +514,8 @@ set_target_properties(${target} PROPERTIES PUBLIC_HEADER "${HEADERS}")
 set_target_properties(${target} PROPERTIES
     VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
 
-install(TARGETS ${target} )
+# Set the library destination to ensure an organized library + plugins dir
+install(TARGETS ${target}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${target}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${target}
+)