From ce7bb75ab33affce07f6c596c8aa4eb30ce68505 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Sun, 2 Apr 2023 18:42:03 +0200
Subject: [PATCH] basic installation reintroduced

---
 CMakeLists.txt           |  6 ++++++
 qmlexport/CMakeLists.txt |  5 +++--
 src/CMakeLists.txt       | 24 ++++++++++++++----------
 support/CMakeLists.txt   |  2 --
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93e19810..60e3052c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,11 @@ macro(qsk_setup_build)
 
 endmacro()
 
+macro(qsk_setup_install)
+    # we have to provide and install a QSkinnyConfig.cmake
+    # TODO ...
+endmacro()
+
 ############################################################################
 # QSkinny
 ############################################################################
@@ -83,6 +88,7 @@ include("QskBuildFunctions")
 
 qsk_setup_Qt()
 qsk_setup_build()
+qsk_setup_install()
 
 add_subdirectory(src)
 add_subdirectory(skins)
diff --git a/qmlexport/CMakeLists.txt b/qmlexport/CMakeLists.txt
index 607b56a3..1d4d4b17 100644
--- a/qmlexport/CMakeLists.txt
+++ b/qmlexport/CMakeLists.txt
@@ -3,7 +3,7 @@
 # This file may be used under the terms of the QSkinny License, Version 1.0
 ############################################################################
 
-set(HEADERS  QskQmlGlobal.h QskShortcutQml.h QskLayoutQml.h QskMainQml.h QskQml.h)
+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)
@@ -11,9 +11,10 @@ qsk_add_library(${target} SHARED ${SOURCES} ${HEADERS})
 
 target_link_libraries(${target} PRIVATE qskinny)
 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 )
 endif()
 
-install(TARGETS ${target} DESTINATION qmlexport)
+install(TARGETS ${target} )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3a527bca..730476fc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -171,8 +171,6 @@ list(APPEND HEADERS
     controls/QskComboBox.h
     controls/QskComboBoxSkinlet.h
     controls/QskControl.h
-    controls/QskControlPrivate.h
-    controls/QskDirtyItemFilter.h
     controls/QskEvent.h
     controls/QskFlickAnimator.h
     controls/QskFocusIndicator.h
@@ -199,7 +197,6 @@ list(APPEND HEADERS
     controls/QskProgressBarSkinlet.h
     controls/QskQuick.h
     controls/QskQuickItem.h
-    controls/QskQuickItemPrivate.h
     controls/QskRadioBox.h
     controls/QskRadioBoxSkinlet.h
     controls/QskScrollArea.h
@@ -247,6 +244,12 @@ list(APPEND HEADERS
     controls/QskWindow.h
 )
 
+list(APPEND PRIVATE_HEADERS
+    controls/QskDirtyItemFilter.h
+    controls/QskControlPrivate.h
+    controls/QskQuickItemPrivate.h
+)
+
 list(APPEND SOURCES
     controls/QskAbstractButton.cpp
     controls/QskAnimator.cpp
@@ -350,6 +353,9 @@ list(APPEND HEADERS
     layouts/QskLinearLayoutEngine.h
     layouts/QskStackBoxAnimator.h
     layouts/QskStackBox.h
+)
+
+list(APPEND PRIVATE_HEADERS
     layouts/QskSubcontrolLayoutEngine.h
 )
 
@@ -423,9 +429,9 @@ endif()
 set(target qskinny)
 
 if(BUILD_QSKDLL)
-    qsk_add_library(${target} SHARED ${SOURCES} ${HEADERS})
+    qsk_add_library(${target} SHARED ${SOURCES} ${HEADERS} ${PRIVATE_HEADERS})
 else()
-    qsk_add_library(${target} STATIC ${SOURCES} ${HEADERS})
+    qsk_add_library(${target} STATIC ${SOURCES} ${HEADERS} ${PRIVATE_HEADERS})
 endif()
 
 if(BUILD_QSKDLL)
@@ -442,15 +448,11 @@ target_include_directories(${target} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/layouts>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/nodes>)
 
-target_include_directories(${target}
-    INTERFACE $<INSTALL_INTERFACE:${QSK_INSTALL_HEADERS}>)
-
 target_link_libraries(${target}
     PUBLIC Qt::Core Qt::CorePrivate Qt::Quick Qt::QuickPrivate)
 
 if (QT_VERSION_MAJOR VERSION_GREATER "5")
-    target_link_libraries(${target}
-        PUBLIC Qt::OpenGL Qt::OpenGLPrivate)
+    target_link_libraries(${target} PUBLIC Qt::OpenGL Qt::OpenGLPrivate)
 endif()
 
 if(ENABLE_HUNSPELL)
@@ -473,3 +475,5 @@ set_target_properties(${target}
 
 list(TRANSFORM HEADERS PREPEND "${CMAKE_CURRENT_LIST_DIR}/")
 set_target_properties(${target} PROPERTIES PUBLIC_HEADER "${HEADERS}")
+
+install(TARGETS ${target} )
diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt
index be83fbb6..9325aaaa 100644
--- a/support/CMakeLists.txt
+++ b/support/CMakeLists.txt
@@ -57,5 +57,3 @@ if(HIDE_SYSTEM_FONTS)
     target_compile_definitions(${target}
         PRIVATE FONTCONFIG_FILE=${QSK_FONTCONF_FILE})
 endif()
-
-install(TARGETS ${target} DESTINATION ${QSK_INSTALL_LIBS})