From fc72a95aafd8e3eba215a7e21b3381f1e55b8191 Mon Sep 17 00:00:00 2001
From: Alexander Kavon <hawk@alexkavon.com>
Date: Thu, 21 Dec 2023 18:26:14 -0500
Subject: [PATCH] updated project paths to namespace qskinny, project namespace
 should be project name, reused qsk_install_* variables

---
 CMakeLists.txt                | 15 ++++++++-------
 cmake/QskBuildFunctions.cmake |  2 +-
 src/CMakeLists.txt            |  6 ++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21ee66fd..1b058b56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,8 +62,9 @@ macro(qsk_setup_build)
 endmacro()
 
 macro(qsk_setup_install)
-    set(QSK_INSTALL_HEADERS include)
-    set(QSK_INSTALL_LIBS lib)
+    string(TOLOWER "${PROJECT_NAME}" PACKAGE_DIR)
+    set(QSK_INSTALL_HEADERS "${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_DIR}")
+    set(QSK_INSTALL_LIBS "${CMAKE_INSTALL_LIBDIR}/${PACKAGE_DIR}")
 endmacro()
 
 ############################################################################
@@ -122,8 +123,8 @@ endif()
 # packaging
 set(PACKAGE_NAME      ${PROJECT_NAME})
 set(PACKAGE_VERSION   ${CMAKE_PROJECT_VERSION})
-set(PACKAGE_NAMESPACE Qsk)
-set(PACKAGE_LOCATION  ${QSK_INSTALL_LIBS}/cmake/${PROJECT_NAME})
+set(PACKAGE_NAMESPACE ${PROJECT_NAME})
+set(PACKAGE_LOCATION  ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 
 install(TARGETS qskinny EXPORT ${PACKAGE_NAME}Targets
     LIBRARY DESTINATION       ${QSK_INSTALL_LIBS}
@@ -140,7 +141,7 @@ write_basic_package_version_file(
 
 export(EXPORT ${PACKAGE_NAME}Targets
     FILE ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}/${PACKAGE_NAME}Targets.cmake
-    NAMESPACE ${PACKAGE_NAMESPACE}::)
+    NAMESPACE "${PACKAGE_NAMESPACE}::")
 
 configure_file(cmake/${PACKAGE_NAME}Config.cmake
     ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}/${PACKAGE_NAME}Config.cmake
@@ -150,7 +151,7 @@ install(EXPORT ${PACKAGE_NAME}Targets
     FILE
         ${PACKAGE_NAME}Targets.cmake
     NAMESPACE
-        ${PACKAGE_NAMESPACE}::
+        "${PACKAGE_NAMESPACE}::"
     DESTINATION
         ${PACKAGE_LOCATION})
 
@@ -162,4 +163,4 @@ install(
     DESTINATION
         ${PACKAGE_LOCATION}
     COMPONENT
-        Devel)
\ No newline at end of file
+        Devel)
diff --git a/cmake/QskBuildFunctions.cmake b/cmake/QskBuildFunctions.cmake
index 11de4bf2..748d849b 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 "${CMAKE_INSTALL_LIBDIR}/qskinny/plugins/${TYPE}" )
+    install(TARGETS ${target} DESTINATION "${QSK_INSTALL_LIBS}/plugins/${TYPE}" )
     set_target_properties(${target} PROPERTIES
         INSTALL_RPATH "\${ORIGIN}/../../lib" )
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f8e9ee0c..80ed914a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -511,11 +511,9 @@ set_target_properties(${target}
 
 list(TRANSFORM HEADERS PREPEND "${CMAKE_CURRENT_LIST_DIR}/")
 set_target_properties(${target} PROPERTIES PUBLIC_HEADER "${HEADERS}")
+set_target_properties(${target} PROPERTIES EXPORT_NAME ${PROJECT_NAME})
 set_target_properties(${target} PROPERTIES
     VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
 
 # 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}
-)
+install(TARGETS ${target})