From 690a3c57a1c5568b9d22f4d6cae127925a1144ea Mon Sep 17 00:00:00 2001
From: Rick Vogel <vrick1991@googlemail.com>
Date: Wed, 10 Jan 2024 00:33:35 +0100
Subject: [PATCH] renamed exported targets and files

---
 .gitignore                                   |  2 ++
 CMakeLists.txt                               | 12 ++++++------
 cmake/QSkinnyConfig.cmake                    |  4 ++--
 cmake/{QskTools.cmake => QSkinnyTools.cmake} |  0
 qmlexport/CMakeLists.txt                     | 17 ++++++++++++++---
 tools/CMakeLists.txt                         |  2 +-
 6 files changed, 25 insertions(+), 12 deletions(-)
 rename cmake/{QskTools.cmake => QSkinnyTools.cmake} (100%)

diff --git a/.gitignore b/.gitignore
index 138bebe4..5369b42e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ qskinny.pro.user
 html
 tags
 .vscode
+.cache
+compile_commands.json
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35f33b74..c3d03164 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,7 +93,7 @@ qsk_setup_options()
 include(GNUInstallDirs)
 
 # loading helper macros
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH ${QSK_CMAKE_DIR})
 
 include("QskConfigMacros")
 include("QskFindMacros")
@@ -110,21 +110,21 @@ include(CMakePackageConfigHelpers)
 
 # write QSkinnyConfigVersion.cmake file for cmake import
 write_basic_package_version_file(
-    ${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}ConfigVersion.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}ConfigVersion.cmake
     VERSION ${PACKAGE_VERSION}
     COMPATIBILITY AnyNewerVersion)
 
 # Copy QSkinnyConfig.cmake to build dir
 configure_file(${QSK_CMAKE_DIR}/${PACKAGE_NAME}Config.cmake
-    ${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}Config.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}Config.cmake
     COPYONLY)
 
 # install QSkinnyConfig.cmake and QSkinnyConfigVersion.cmake
-# and QskTools.cmake file to lib/cmake/QSkinny directory
+# file to lib/cmake/QSkinny directory
 install(
     FILES
-        ${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}Config.cmake
-        ${CMAKE_BINARY_DIR}/_QSkinny/${PACKAGE_NAME}ConfigVersion.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}Config.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}ConfigVersion.cmake
     DESTINATION
         ${PACKAGE_LOCATION}
     COMPONENT
diff --git a/cmake/QSkinnyConfig.cmake b/cmake/QSkinnyConfig.cmake
index 14ab054c..8520eeb3 100644
--- a/cmake/QSkinnyConfig.cmake
+++ b/cmake/QSkinnyConfig.cmake
@@ -1,3 +1,3 @@
 include("${CMAKE_CURRENT_LIST_DIR}/QSkinnyTargets.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/QskTools.cmake" OPTIONAL)
-include("${CMAKE_CURRENT_LIST_DIR}/QmlExportTargets.cmake" OPTIONAL)
+include("${CMAKE_CURRENT_LIST_DIR}/QSkinnyTools.cmake" OPTIONAL)
+include("${CMAKE_CURRENT_LIST_DIR}/QSkinnyQmlExportTargets.cmake" OPTIONAL)
diff --git a/cmake/QskTools.cmake b/cmake/QSkinnyTools.cmake
similarity index 100%
rename from cmake/QskTools.cmake
rename to cmake/QSkinnyTools.cmake
diff --git a/qmlexport/CMakeLists.txt b/qmlexport/CMakeLists.txt
index f80804fb..613bdb26 100644
--- a/qmlexport/CMakeLists.txt
+++ b/qmlexport/CMakeLists.txt
@@ -3,8 +3,18 @@
 #           SPDX-License-Identifier: BSD-3-Clause
 ############################################################################
 
-set(HEADERS QskQmlGlobal.h QskShortcutQml.h QskLayoutQml.h QskMainQml.h QskQml.h)
-set(SOURCES QskShortcutQml.cpp QskLayoutQml.cpp QskMainQml.cpp QskQml.cpp)
+set(HEADERS
+    QskQmlGlobal.h
+    QskShortcutQml.h
+    QskLayoutQml.h
+    QskMainQml.h
+    QskQml.h)
+
+set(SOURCES
+    QskShortcutQml.cpp
+    QskLayoutQml.cpp
+    QskMainQml.cpp
+    QskQml.cpp)
 
 set(target qskqmlexport)
 qsk_add_library(${target} SHARED ${SOURCES} ${HEADERS})
@@ -22,7 +32,8 @@ if(BUILD_QSKDLL)
 endif()
 
 # packaging
-set(PACKAGE_NAME            QmlExport)
+set(PACKAGE_NAME            QSkinnyQmlExport)
+set(QSKQE_INSTALL_HEADERS   "${CMAKE_INSTALL_INCLUDEDIR}/${target}")
 
 set_target_properties(${target} PROPERTIES FOLDER libs)
 set_target_properties(${target} PROPERTIES EXPORT_NAME ${PACKAGE_NAME})
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 53162269..3052d313 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -2,7 +2,7 @@ if(TARGET Qt::Svg)
     add_subdirectory(svg2qvg)
     install(
         FILES
-            ${QSK_CMAKE_DIR}/QskTools.cmake
+            ${QSK_CMAKE_DIR}/QSkinnyTools.cmake
         DESTINATION
             ${PACKAGE_LOCATION}
         COMPONENT