From 09ee9dad3a80f6a50b9ce04f26122109c42023a9 Mon Sep 17 00:00:00 2001
From: Rick Vogel <vrick1991@googlemail.com>
Date: Thu, 11 Jan 2024 17:46:28 +0100
Subject: [PATCH] changed qskinny cmake package

---
 CMakeLists.txt           | 14 +++++++-------
 qmlexport/CMakeLists.txt |  8 ++++++--
 src/CMakeLists.txt       |  4 ++++
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3d03164..7d1eeaab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,14 +7,14 @@ cmake_minimum_required(VERSION 3.16.3)
 
 macro(qsk_setup_options)
 
-    option(BUILD_PEDANTIC "Enable pedantic compile flags ( only GNU/CLANG )" OFF)
-    option(BUILD_QSKDLL "Build libs ( not plugins ) as shared library" ON)
-    option(BUILD_QML_EXPORT "Exporting QSkinny to QML" ON)
+    option(BUILD_PEDANTIC     "Enable pedantic compile flags ( only GNU/CLANG )" OFF)
+    option(BUILD_QSKDLL       "Build libs ( not plugins ) as shared library" ON)
+    option(BUILD_QML_EXPORT   "Exporting QSkinny to QML" ON)
 
-    option(BUILD_TOOLS      "Build qskinny tools" ON)
+    option(BUILD_TOOLS        "Build qskinny tools" ON)
     option(BUILD_INPUTCONTEXT "Build virtual keyboard support" ON)
-    option(BUILD_EXAMPLES   "Build qskinny examples" ON)
-    option(BUILD_PLAYGROUND "Build qskinny playground" ON)
+    option(BUILD_EXAMPLES     "Build qskinny examples" ON)
+    option(BUILD_PLAYGROUND   "Build qskinny playground" ON)
 
     # we actually want to use cmake_dependent_option - minimum cmake version ??
 
@@ -66,7 +66,7 @@ macro(qsk_setup_install)
     # package vars
     set(PACKAGE_NAME      ${PROJECT_NAME})
     set(PACKAGE_VERSION   ${CMAKE_PROJECT_VERSION})
-    set(PACKAGE_NAMESPACE ${PROJECT_NAME}::)
+    set(PACKAGE_NAMESPACE Qsk::)
     set(PACKAGE_LOCATION  ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 
     # install paths for headers and libraries
diff --git a/qmlexport/CMakeLists.txt b/qmlexport/CMakeLists.txt
index 613bdb26..244692ff 100644
--- a/qmlexport/CMakeLists.txt
+++ b/qmlexport/CMakeLists.txt
@@ -32,11 +32,11 @@ if(BUILD_QSKDLL)
 endif()
 
 # packaging
-set(PACKAGE_NAME            QSkinnyQmlExport)
+set(PACKAGE_NAME            QmlExport)
 set(QSKQE_INSTALL_HEADERS   "${CMAKE_INSTALL_INCLUDEDIR}/${target}")
 
 set_target_properties(${target} PROPERTIES FOLDER libs)
-set_target_properties(${target} PROPERTIES EXPORT_NAME ${PACKAGE_NAME})
+set_target_properties(${target} PROPERTIES EXPORT_NAME QmlExport)
 
 install(TARGETS ${target} EXPORT ${PACKAGE_NAME}Targets
     LIBRARY DESTINATION       ${QSK_INSTALL_LIBS}
@@ -53,3 +53,7 @@ install(EXPORT ${PACKAGE_NAME}Targets
         ${PACKAGE_NAMESPACE}
     DESTINATION
         ${PACKAGE_LOCATION})
+
+install(FILES $<TARGET_PDB_FILE:${target}> 
+    DESTINATION
+        ${QSK_INSTALL_LIBS} OPTIONAL)
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b40aa5f8..66d31af8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -561,3 +561,7 @@ install(EXPORT ${PACKAGE_NAME}Targets
         ${PACKAGE_NAMESPACE}
     DESTINATION
         ${PACKAGE_LOCATION})
+
+install(FILES $<TARGET_PDB_FILE:${target}> 
+    DESTINATION 
+        ${QSK_INSTALL_LIBS} OPTIONAL)
\ No newline at end of file