From 0c18f33892d3515e519c6ddcee0381f54e554fd5 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 10 Dec 2020 02:14:17 +0000 Subject: [PATCH] merge KatieLibraryTargets and KatieBinaryTargets exports the idea was to install them separately, one along with the libraries and one along with the tools but they suite the Devel component better and are installed as part of it so no reason to keep them separate Signed-off-by: Ivailo Monev --- CMakeLists.txt | 12 ++---------- cmake/KatieConfig.cmake | 3 +-- package/freebsd/pkg-plist | 6 ++---- package/netbsd/PLIST | 6 ++---- package/openbsd/pkg/PLIST | 6 ++---- src/core/CMakeLists.txt | 2 +- src/dbus/CMakeLists.txt | 2 +- src/declarative/CMakeLists.txt | 2 +- src/designer/CMakeLists.txt | 2 +- src/designer/components/CMakeLists.txt | 2 +- src/gui/CMakeLists.txt | 2 +- src/network/CMakeLists.txt | 2 +- src/script/CMakeLists.txt | 2 +- src/scripttools/CMakeLists.txt | 2 +- src/sql/CMakeLists.txt | 2 +- src/svg/CMakeLists.txt | 2 +- src/test/CMakeLists.txt | 2 +- src/tools/moc/CMakeLists.txt | 2 +- src/tools/qdbus/CMakeLists.txt | 2 +- src/tools/qdbusviewer/CMakeLists.txt | 2 +- src/tools/qscript/CMakeLists.txt | 2 +- src/tools/qtconfig/CMakeLists.txt | 2 +- src/tools/rcc/CMakeLists.txt | 2 +- src/tools/uic/CMakeLists.txt | 2 +- src/uitools/CMakeLists.txt | 2 +- src/xml/CMakeLists.txt | 2 +- 26 files changed, 30 insertions(+), 45 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c36ac53b..d99aae949 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1014,18 +1014,10 @@ install( ) install( - EXPORT KatieLibraryTargets + EXPORT KatieTargets NAMESPACE Katie:: DESTINATION ${KATIE_CMAKE_PATH} - FILE KatieLibraryTargets.cmake - COMPONENT Devel -) - -install( - EXPORT KatieBinaryTargets - NAMESPACE Katie:: - DESTINATION ${KATIE_CMAKE_PATH} - FILE KatieBinaryTargets.cmake + FILE KatieTargets.cmake COMPONENT Devel ) diff --git a/cmake/KatieConfig.cmake b/cmake/KatieConfig.cmake index 7d1852fc5..9fea6eb8d 100644 --- a/cmake/KatieConfig.cmake +++ b/cmake/KatieConfig.cmake @@ -40,8 +40,7 @@ if(NOT KATIE_FOUND) set(KATIE_PIXMAPS_PATH "@KATIE_PIXMAPS_PATH@") # Include definitions for IMPORTED targets - include("${CMAKE_CURRENT_LIST_DIR}/KatieLibraryTargets.cmake") - include("${CMAKE_CURRENT_LIST_DIR}/KatieBinaryTargets.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/KatieTargets.cmake") # Include version info, required for the Qt4 compatibility setup include("${CMAKE_CURRENT_LIST_DIR}/KatieConfigVersion.cmake") diff --git a/package/freebsd/pkg-plist b/package/freebsd/pkg-plist index de40ed84e..180788f6c 100644 --- a/package/freebsd/pkg-plist +++ b/package/freebsd/pkg-plist @@ -1458,12 +1458,10 @@ include/katie/QtXml/QtXml include/katie/QtXml/qdom.h include/katie/QtXml/qxml.h include/katie/QtXml/qxmlstream.h -lib/cmake/Katie/KatieBinaryTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Katie/KatieBinaryTargets.cmake lib/cmake/Katie/KatieConfig.cmake lib/cmake/Katie/KatieConfigVersion.cmake -lib/cmake/Katie/KatieLibraryTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/Katie/KatieLibraryTargets.cmake +lib/cmake/Katie/KatieTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Katie/KatieTargets.cmake lib/cmake/Katie/Qt4UseFile.cmake lib/cmake/Katie/mkspecs/bsymbolic_functions.cpp lib/cmake/Katie/mkspecs/mkspecs.cmake diff --git a/package/netbsd/PLIST b/package/netbsd/PLIST index ea0a864bc..8590f30b7 100644 --- a/package/netbsd/PLIST +++ b/package/netbsd/PLIST @@ -1461,12 +1461,10 @@ include/katie/QtXml/QtXml include/katie/QtXml/qdom.h include/katie/QtXml/qxml.h include/katie/QtXml/qxmlstream.h -lib/cmake/Katie/KatieBinaryTargets-relwithdebinfo.cmake -lib/cmake/Katie/KatieBinaryTargets.cmake lib/cmake/Katie/KatieConfig.cmake lib/cmake/Katie/KatieConfigVersion.cmake -lib/cmake/Katie/KatieLibraryTargets-relwithdebinfo.cmake -lib/cmake/Katie/KatieLibraryTargets.cmake +lib/cmake/Katie/KatieTargets-relwithdebinfo.cmake +lib/cmake/Katie/KatieTargets.cmake lib/cmake/Katie/Qt4UseFile.cmake lib/cmake/Katie/mkspecs/bsymbolic_functions.cpp lib/cmake/Katie/mkspecs/mkspecs.cmake diff --git a/package/openbsd/pkg/PLIST b/package/openbsd/pkg/PLIST index f32bc4474..5d9e70552 100644 --- a/package/openbsd/pkg/PLIST +++ b/package/openbsd/pkg/PLIST @@ -1475,12 +1475,10 @@ include/katie/QtXml/qdom.h include/katie/QtXml/qxml.h include/katie/QtXml/qxmlstream.h lib/cmake/Katie/ -lib/cmake/Katie/KatieBinaryTargets${MODCMAKE_BUILD_SUFFIX} -lib/cmake/Katie/KatieBinaryTargets.cmake lib/cmake/Katie/KatieConfig.cmake lib/cmake/Katie/KatieConfigVersion.cmake -lib/cmake/Katie/KatieLibraryTargets${MODCMAKE_BUILD_SUFFIX} -lib/cmake/Katie/KatieLibraryTargets.cmake +lib/cmake/Katie/KatieTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Katie/KatieTargets.cmake lib/cmake/Katie/Qt4UseFile.cmake lib/cmake/Katie/mkspecs/ lib/cmake/Katie/mkspecs/bsymbolic_functions.cpp diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 2b34e5a42..9108b16d2 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -463,7 +463,7 @@ set_target_properties(KtCore PROPERTIES install( TARGETS KtCore - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index 81f240767..68c4472f0 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -111,7 +111,7 @@ set_target_properties(KtDBus PROPERTIES install( TARGETS KtDBus - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/declarative/CMakeLists.txt b/src/declarative/CMakeLists.txt index b0d5a8fae..316137fd3 100644 --- a/src/declarative/CMakeLists.txt +++ b/src/declarative/CMakeLists.txt @@ -337,7 +337,7 @@ set_target_properties(KtDeclarative PROPERTIES install( TARGETS KtDeclarative - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/designer/CMakeLists.txt b/src/designer/CMakeLists.txt index 5a2bbd56c..430ee8eb9 100644 --- a/src/designer/CMakeLists.txt +++ b/src/designer/CMakeLists.txt @@ -294,7 +294,7 @@ katie_setup_object(KtDesigner sharedqtgradienteditor sharedqtpropertybrowser sha install( TARGETS KtDesigner - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/designer/components/CMakeLists.txt b/src/designer/components/CMakeLists.txt index f9fb7e5fe..00b987770 100644 --- a/src/designer/components/CMakeLists.txt +++ b/src/designer/components/CMakeLists.txt @@ -229,7 +229,7 @@ katie_setup_object(KtDesignerComponents sharedfindwidget sharedqtpropertybrowser install( TARGETS KtDesignerComponents - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 2591a6e6f..4b5564057 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1058,7 +1058,7 @@ set_target_properties(KtGui PROPERTIES install( TARGETS KtGui - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 9de2040cf..1648b2e51 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -228,7 +228,7 @@ set_target_properties(KtNetwork PROPERTIES install( TARGETS KtNetwork - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/script/CMakeLists.txt b/src/script/CMakeLists.txt index bfe1bb772..367978d4b 100644 --- a/src/script/CMakeLists.txt +++ b/src/script/CMakeLists.txt @@ -246,7 +246,7 @@ set_target_properties(KtScript PROPERTIES install( TARGETS KtScript - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/scripttools/CMakeLists.txt b/src/scripttools/CMakeLists.txt index a0a10c5de..63909bdf2 100644 --- a/src/scripttools/CMakeLists.txt +++ b/src/scripttools/CMakeLists.txt @@ -183,7 +183,7 @@ set_target_properties(KtScriptTools PROPERTIES install( TARGETS KtScriptTools - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/sql/CMakeLists.txt b/src/sql/CMakeLists.txt index 3b8955fdc..eec43432d 100644 --- a/src/sql/CMakeLists.txt +++ b/src/sql/CMakeLists.txt @@ -83,7 +83,7 @@ set_target_properties(KtSql PROPERTIES install( TARGETS KtSql - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/svg/CMakeLists.txt b/src/svg/CMakeLists.txt index f2ad7f996..84f19f32b 100644 --- a/src/svg/CMakeLists.txt +++ b/src/svg/CMakeLists.txt @@ -65,7 +65,7 @@ set_target_properties(KtSvg PROPERTIES install( TARGETS KtSvg - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 4d45499c4..bb5560b01 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -115,7 +115,7 @@ set_target_properties(KtTest PROPERTIES install( TARGETS KtTest - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt index 4ab3fad39..913305c28 100644 --- a/src/tools/moc/CMakeLists.txt +++ b/src/tools/moc/CMakeLists.txt @@ -93,7 +93,7 @@ set_target_properties(moc PROPERTIES install( TARGETS moc - EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} RUNTIME DESTINATION ${KATIE_BINARIES_PATH} COMPONENT Tools ) diff --git a/src/tools/qdbus/CMakeLists.txt b/src/tools/qdbus/CMakeLists.txt index bcdeb21dd..ece2e941f 100644 --- a/src/tools/qdbus/CMakeLists.txt +++ b/src/tools/qdbus/CMakeLists.txt @@ -37,7 +37,7 @@ set_target_properties(qdbusxml2cpp PROPERTIES install( TARGETS qdbus qdbuscpp2xml qdbusxml2cpp - EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} RUNTIME DESTINATION ${KATIE_BINARIES_PATH} COMPONENT Tools ) diff --git a/src/tools/qdbusviewer/CMakeLists.txt b/src/tools/qdbusviewer/CMakeLists.txt index df5ac08a5..86fef88a0 100644 --- a/src/tools/qdbusviewer/CMakeLists.txt +++ b/src/tools/qdbusviewer/CMakeLists.txt @@ -44,7 +44,7 @@ set_target_properties(qdbusviewer PROPERTIES install( TARGETS qdbusviewer - EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} RUNTIME DESTINATION ${KATIE_BINARIES_PATH} COMPONENT Tools ) diff --git a/src/tools/qscript/CMakeLists.txt b/src/tools/qscript/CMakeLists.txt index 7e965cdbe..720f78a9a 100644 --- a/src/tools/qscript/CMakeLists.txt +++ b/src/tools/qscript/CMakeLists.txt @@ -22,7 +22,7 @@ set_target_properties(qscript PROPERTIES install( TARGETS qscript - EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} RUNTIME DESTINATION ${KATIE_BINARIES_PATH} COMPONENT Tools ) diff --git a/src/tools/qtconfig/CMakeLists.txt b/src/tools/qtconfig/CMakeLists.txt index d731b77e2..926f9fad1 100644 --- a/src/tools/qtconfig/CMakeLists.txt +++ b/src/tools/qtconfig/CMakeLists.txt @@ -51,7 +51,7 @@ set_target_properties(qtconfig PROPERTIES install( TARGETS qtconfig - EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} RUNTIME DESTINATION ${KATIE_BINARIES_PATH} COMPONENT Tools ) diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt index 20d50dc9e..adba345e0 100644 --- a/src/tools/rcc/CMakeLists.txt +++ b/src/tools/rcc/CMakeLists.txt @@ -32,7 +32,7 @@ set_target_properties(rcc PROPERTIES install( TARGETS rcc - EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} RUNTIME DESTINATION ${KATIE_BINARIES_PATH} COMPONENT Tools ) diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt index 8a3e14783..9485d5fa8 100644 --- a/src/tools/uic/CMakeLists.txt +++ b/src/tools/uic/CMakeLists.txt @@ -39,7 +39,7 @@ set_target_properties(uic PROPERTIES install( TARGETS uic - EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} RUNTIME DESTINATION ${KATIE_BINARIES_PATH} COMPONENT Tools ) diff --git a/src/uitools/CMakeLists.txt b/src/uitools/CMakeLists.txt index da2df0772..1d649343d 100644 --- a/src/uitools/CMakeLists.txt +++ b/src/uitools/CMakeLists.txt @@ -59,7 +59,7 @@ set_target_properties(KtUiTools PROPERTIES install( TARGETS KtUiTools - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index 7a5915fc5..bc619bdba 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -43,7 +43,7 @@ set_target_properties(KtXml PROPERTIES install( TARGETS KtXml - EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} + EXPORT KatieTargets ${INSTALL_TARGETS_DEFAULT_ARGS} DESTINATION ${KATIE_LIBRARIES_PATH} COMPONENT Runtime ) -- 2.11.0