call katie_generate_package() before katie_setup_paths()

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 612114b..67f3e95 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -363,6 +363,7 @@ endif()
 
 katie_generate_misc("${CORE_HEADERS}" QtCore)
 katie_generate_public("${CORE_PUBLIC_HEADERS}" QtCore)
+katie_generate_package(KtCore "")
 katie_resources(${CORE_SOURCES} ${CORE_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -375,8 +376,6 @@ set_target_properties(KtCore PROPERTIES
     EXPORT_NAME Core
 )
 
-katie_generate_package(KtCore "")
-
 install(
     TARGETS KtCore
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index 5d701bb..7c5e6f9 100644 (file)
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/CMakeLists.txt
@@ -123,6 +123,7 @@ endif()
 
 katie_generate_misc("${DBUS_HEADERS}" QtDBus)
 katie_generate_public("${DBUS_PUBLIC_HEADERS}" QtDBus)
+katie_generate_package(KtDBus "KtCore KtXml")
 katie_resources(${DBUS_SOURCES} ${DBUS_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -135,8 +136,6 @@ set_target_properties(KtDBus PROPERTIES
     EXPORT_NAME DBus
 )
 
-katie_generate_package(KtDBus "KtCore KtXml")
-
 install(
     TARGETS KtDBus
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/declarative/CMakeLists.txt b/src/declarative/CMakeLists.txt
index 36ad9f3..b16c236 100644 (file)
--- a/src/declarative/CMakeLists.txt
+++ b/src/declarative/CMakeLists.txt
@@ -73,6 +73,7 @@ endif()
 
 katie_generate_misc("${DECLARATIVE_HEADERS}" QtDeclarative)
 katie_generate_public("${DECLARATIVE_PUBLIC_HEADERS}" QtDeclarative)
+katie_generate_package(KtDeclarative "KtCore KtGui KtNetwork KtScript KtXmlPatterns KtSql")
 katie_resources(${DECLARATIVE_SOURCES} ${DECLARATIVE_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -85,8 +86,6 @@ set_target_properties(KtDeclarative PROPERTIES
     EXPORT_NAME Declarative
 )
 
-katie_generate_package(KtDeclarative "KtCore KtGui KtNetwork KtScript KtXmlPatterns KtSql")
-
 install(
     TARGETS KtDeclarative
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/designer/CMakeLists.txt b/src/designer/CMakeLists.txt
index 198cb21..7c0d011 100644 (file)
--- a/src/designer/CMakeLists.txt
+++ b/src/designer/CMakeLists.txt
@@ -114,6 +114,7 @@ endif()
 
 katie_generate_misc("${DESIGNER_HEADERS}" QtDesigner)
 katie_generate_public("${DESIGNER_PUBLIC_HEADERS}" QtDesigner)
+katie_generate_package(KtDesigner "KtCore KtGui KtXml KtUiTools")
 katie_resources(${DESIGNER_SOURCES} ${DESIGNER_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -131,7 +132,6 @@ set_target_properties(KtDesigner PROPERTIES
     EXPORT_NAME Designer
 )
 
-katie_generate_package(KtDesigner "KtCore KtGui KtXml KtUiTools")
 katie_setup_object(KtDesigner sharedqtgradienteditor sharedqtpropertybrowser shareddeviceskin sharedfindwidget)
 
 install(

diff --git a/src/designer/components/CMakeLists.txt b/src/designer/components/CMakeLists.txt
index d82c7f9..5c71812 100644 (file)
--- a/src/designer/components/CMakeLists.txt
+++ b/src/designer/components/CMakeLists.txt
@@ -79,6 +79,7 @@ endif()
 # headers go in one place!
 katie_generate_misc("${DESIGNERCOMPONENTS_HEADERS}" QtDesignerComponents)
 katie_generate_public("${DESIGNERCOMPONENTS_PUBLIC_HEADERS}" QtDesignerComponents)
+katie_generate_package(KtDesignerComponents "KtCore KtGui KtXml KtDesigner KtScript")
 katie_resources(${DESIGNERCOMPONENTS_SOURCES} ${DESIGNERCOMPONENTS_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -96,7 +97,6 @@ set_target_properties(KtDesignerComponents PROPERTIES
     EXPORT_NAME DesignerComponents
 )
 
-katie_generate_package(KtDesignerComponents "KtCore KtGui KtXml KtDesigner KtScript")
 katie_setup_object(KtDesignerComponents sharedfindwidget sharedqtpropertybrowser sharedqtgradienteditor)
 
 install(

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 645d64b..eea9275 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -492,6 +492,7 @@ endif()
 
 katie_generate_misc("${GUI_HEADERS}" QtGui)
 katie_generate_public("${GUI_PUBLIC_HEADERS}" QtGui)
+katie_generate_package(KtGui "KtCore")
 katie_resources(${GUI_SOURCES} ${GUI_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -504,8 +505,6 @@ set_target_properties(KtGui PROPERTIES
     EXPORT_NAME Gui
 )
 
-katie_generate_package(KtGui "KtCore")
-
 install(
     TARGETS KtGui
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/help/CMakeLists.txt b/src/help/CMakeLists.txt
index 2068a45..a123151 100644 (file)
--- a/src/help/CMakeLists.txt
+++ b/src/help/CMakeLists.txt
@@ -89,6 +89,7 @@ include_directories(
 
 katie_generate_misc("${HELP_HEADERS}" QtHelp)
 katie_generate_public("${HELP_PUBLIC_HEADERS}" QtHelp)
+katie_generate_package(KtHelp "KtCore KtGui KtNetwork KtSql KtXml")
 katie_resources(${HELP_SOURCES} ${HELP_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -101,8 +102,6 @@ set_target_properties(KtHelp PROPERTIES
     EXPORT_NAME Help
 )
 
-katie_generate_package(KtHelp "KtCore KtGui KtNetwork KtSql KtXml")
-
 install(
     TARGETS KtHelp
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index ffa1a6c..422ed9b 100644 (file)
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -39,6 +39,7 @@ include_directories(
 
 katie_generate_misc("${MULTIMEDIA_HEADERS}" QtMultimedia)
 katie_generate_public("${MULTIMEDIA_PUBLIC_HEADERS}" QtMultimedia)
+katie_generate_package(KtMultimedia "KtCore KtGui")
 katie_resources(${MULTIMEDIA_SOURCES} ${MULTIMEDIA_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -51,8 +52,6 @@ set_target_properties(KtMultimedia PROPERTIES
     EXPORT_NAME Multimedia
 )
 
-katie_generate_package(KtMultimedia "KtCore KtGui")
-
 install(
     TARGETS KtMultimedia
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 9ae1bfc..0ea2d1c 100644 (file)
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -83,6 +83,7 @@ endif()
 
 katie_generate_misc("${NETWORK_HEADERS}" QtNetwork)
 katie_generate_public("${NETWORK_PUBLIC_HEADERS}" QtNetwork)
+katie_generate_package(KtNetwork "KtCore")
 katie_resources(${NETWORK_SOURCES} ${NETWORK_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -95,8 +96,6 @@ set_target_properties(KtNetwork PROPERTIES
     EXPORT_NAME Network
 )
 
-katie_generate_package(KtNetwork "KtCore")
-
 install(
     TARGETS KtNetwork
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index ffd8db9..e1f927b 100644 (file)
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -189,6 +189,7 @@ endif()
 
 katie_generate_misc("${OPENGL_HEADERS}" QtOpenGL)
 katie_generate_public("${OPENGL_PUBLIC_HEADERS}" QtOpenGL)
+katie_generate_package(KtOpenGL "KtCore KtGui")
 katie_resources(${OPENGL_SOURCES} ${OPENGL_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -201,8 +202,6 @@ set_target_properties(KtOpenGL PROPERTIES
     EXPORT_NAME OpenGL
 )
 
-katie_generate_package(KtOpenGL "KtCore KtGui")
-
 install(
     TARGETS KtOpenGL
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/script/CMakeLists.txt b/src/script/CMakeLists.txt
index f7c3e9a..02ceba8 100644 (file)
--- a/src/script/CMakeLists.txt
+++ b/src/script/CMakeLists.txt
@@ -269,6 +269,7 @@ endif()
 
 katie_generate_misc("${SCRIPT_HEADERS}" QtScript)
 katie_generate_public("${SCRIPT_PUBLIC_HEADERS}" QtScript)
+katie_generate_package(KtScript "KtCore")
 katie_resources(${SCRIPT_SOURCES} ${SCRIPT_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -281,8 +282,6 @@ set_target_properties(KtScript PROPERTIES
     EXPORT_NAME Script
 )
 
-katie_generate_package(KtScript "KtCore")
-
 install(
     TARGETS KtScript
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/scripttools/CMakeLists.txt b/src/scripttools/CMakeLists.txt
index eb25753..bbe5516 100644 (file)
--- a/src/scripttools/CMakeLists.txt
+++ b/src/scripttools/CMakeLists.txt
@@ -25,6 +25,7 @@ include_directories(
 
 katie_generate_misc("${SCRIPTTOOLS_HEADERS}" QtScriptTools)
 katie_generate_public("${SCRIPTTOOLS_PUBLIC_HEADERS}" QtScriptTools)
+katie_generate_package(KtScriptTools "KtCore KtGui KtScript")
 katie_resources(${SCRIPTTOOLS_SOURCES} ${SCRIPTTOOLS_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -37,8 +38,6 @@ set_target_properties(KtScriptTools PROPERTIES
     EXPORT_NAME ScriptTools
 )
 
-katie_generate_package(KtScriptTools "KtCore KtGui KtScript")
-
 install(
     TARGETS KtScriptTools
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt
index ad97b5a..0bc3b9b 100644 (file)
--- a/src/sql/CMakeLists.txt
+++ b/src/sql/CMakeLists.txt
@@ -78,6 +78,7 @@ include_directories(
 
 katie_generate_misc("${SQL_HEADERS}" QtSql)
 katie_generate_public("${SQL_PUBLIC_HEADERS}" QtSql)
+katie_generate_package(KtSql "KtCore")
 katie_resources(${SQL_SOURCES} ${SQL_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -90,8 +91,6 @@ set_target_properties(KtSql PROPERTIES
     EXPORT_NAME Sql
 )
 
-katie_generate_package(KtSql "KtCore")
-
 install(
     TARGETS KtSql
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt
index 7687296..5b49d9d 100644 (file)
--- a/src/svg/CMakeLists.txt
+++ b/src/svg/CMakeLists.txt
@@ -70,6 +70,7 @@ endif()
 
 katie_generate_misc("${SVG_HEADERS}" QtSvg)
 katie_generate_public("${SVG_PUBLIC_HEADERS}" QtSvg)
+katie_generate_package(KtSvg "KtCore KtGui")
 katie_resources(${SVG_SOURCES} ${SVG_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -82,8 +83,6 @@ set_target_properties(KtSvg PROPERTIES
     EXPORT_NAME Svg
 )
 
-katie_generate_package(KtSvg "KtCore KtGui")
-
 install(
     TARGETS KtSvg
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 7bb7bc8..a17180b 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -129,6 +129,7 @@ endif()
 
 katie_generate_misc("${TEST_HEADERS}" QtTest)
 katie_generate_public("${TEST_PUBLIC_HEADERS}" QtTest)
+katie_generate_package(KtTest "KtCore")
 katie_resources(${TEST_SOURCES} ${TEST_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -141,8 +142,6 @@ set_target_properties(KtTest PROPERTIES
     EXPORT_NAME Test
 )
 
-katie_generate_package(KtTest "KtCore")
-
 install(
     TARGETS KtTest
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/uitools/CMakeLists.txt b/src/uitools/CMakeLists.txt
index 54677b9..3abd2d0 100644 (file)
--- a/src/uitools/CMakeLists.txt
+++ b/src/uitools/CMakeLists.txt
@@ -57,6 +57,7 @@ include_directories(
 
 katie_generate_misc("${UITOOLS_HEADERS}" QtUiTools)
 katie_generate_public("${UITOOLS_PUBLIC_HEADERS}" QtUiTools)
+katie_generate_package(KtUiTools "KtCore KtGui KtXml KtScript")
 katie_resources(${UITOOLS_SOURCES} ${UITOOLS_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -69,8 +70,6 @@ set_target_properties(KtUiTools PROPERTIES
     EXPORT_NAME UiTools
 )
 
-katie_generate_package(KtUiTools "KtCore KtGui KtXml KtScript")
-
 install(
     TARGETS KtUiTools
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 6311c7d..c3cd64b 100644 (file)
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -72,6 +72,7 @@ endif()
 
 katie_generate_misc("${XML_HEADERS}" QtXml)
 katie_generate_public("${XML_PUBLIC_HEADERS}" QtXml)
+katie_generate_package(KtXml "KtCore")
 katie_resources(${XML_SOURCES} ${XML_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -84,8 +85,6 @@ set_target_properties(KtXml PROPERTIES
     EXPORT_NAME Xml
 )
 
-katie_generate_package(KtXml "KtCore")
-
 install(
     TARGETS KtXml
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

diff --git a/src/xmlpatterns/CMakeLists.txt b/src/xmlpatterns/CMakeLists.txt
index 76a1b3c..c05976a 100644 (file)
--- a/src/xmlpatterns/CMakeLists.txt
+++ b/src/xmlpatterns/CMakeLists.txt
@@ -74,6 +74,7 @@ include_directories(
 
 katie_generate_misc("${XMLPATTERNS_HEADERS}" QtXmlPatterns)
 katie_generate_public("${XMLPATTERNS_PUBLIC_HEADERS}" QtXmlPatterns)
+katie_generate_package(KtXmlPatterns "KtCore KtNetwork")
 katie_resources(${XMLPATTERNS_SOURCES} ${XMLPATTERNS_HEADERS})
 katie_setup_flags()
 katie_setup_paths()
@@ -91,8 +92,6 @@ set_target_properties(KtXmlPatterns PROPERTIES
     EXPORT_NAME XmlPatterns
 )
 
-katie_generate_package(KtXmlPatterns "KtCore KtNetwork")
-
 install(
     TARGETS KtXmlPatterns
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}