preparations to support all-in-one targets build

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

CMakeLists.txt

@@ -113,6 +113,9 @@ add_feature_info(x11 WITH_X11 "an open source something")
 option(KATIE_BOOTSTRAP "Build only core tools" OFF)
 add_feature_info(bootstrap KATIE_BOOTSTRAP "internal build option")
 
+option(KATIE_ALLINONE "Build targets from single source file" OFF)
+add_feature_info(allinone KATIE_ALLINONE "experimental build option")
+
 option(WITH_OPENGLES1 "Build opengles1 support" OFF)
 add_feature_info(opengles1 WITH_OPENGLES1 "an open source something")
 

cmake/modules/KatieBuildMacros.cmake

@@ -107,37 +107,115 @@ function(KATIE_FIXUP_STRING INSTR OUTSTR)
     endif()
 endfunction()
 
-# since KATIE_SETUP_FLAGS() applies KATIE_CXXFLAGS and some compilers choke
+macro(KATIE_SETUP_FLAGS FORTARGET)
-# on them just filter them instead of using KATIE_CFLAGS
-function(KATIE_FILTER_FLAGS INSTR OUTSTR)
-    set(KATIE_CFILTER "-fvisibility-inlines-hidden" CACHE STRING "C flags to filter from the C++ flags")
-    set(modstring "${INSTR}")
-    foreach(cxxflag ${KATIE_CFILTER})
-        string(REPLACE "${cxxflag}" " " modstring "${modstring}")
-    endforeach()
-    set(${OUTSTR} "${modstring}" PARENT_SCOPE)
-endfunction()
-
-function(KATIE_SETUP_FLAGS)
     katie_fixup_string("${KATIE_CXXFLAGS}" KATIE_CXXFLAGS)
     katie_fixup_string("${KATIE_LDFLAGS}" KATIE_LDFLAGS)
-    katie_filter_flags("${KATIE_CXXFLAGS}" KATIE_CFLAGS)
 
-    if(ARGN)
+    # since some compilers choke CXX flags when building C sources just filter
-        foreach(target ${ARGN})
+    # the C++-specific flags instead of using KATIE_CFLAGS due to lack of
-            set_target_properties(${target} PROPERTIES
+    # per-language properties (e.g. CXX_COMPILE_FLAGS)
-                COMPILE_FLAGS "${KATIE_CXXFLAGS}"
+    set(KATIE_CFILTER "-fvisibility-inlines-hidden" CACHE STRING "C flags to filter from the C++ flags")
-                LINK_FLAGS "${KATIE_LDFLAGS}"
+    set(modflags "${KATIE_CXXFLAGS}")
-            )
+    foreach(cxxflag ${KATIE_CFILTER})
-        endforeach()
+        string(REPLACE "${cxxflag}" " " modflags "${modflags}")
-    else()
+    endforeach()
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${KATIE_CFLAGS}" PARENT_SCOPE)
+
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KATIE_CXXFLAGS}" PARENT_SCOPE)
+    set_target_properties(${FORTARGET} PROPERTIES
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${KATIE_LDFLAGS}" PARENT_SCOPE)
+        COMPILE_FLAGS "${modflags}"
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${KATIE_LDFLAGS}" PARENT_SCOPE)
+        LINK_FLAGS "${KATIE_LDFLAGS}"
-        set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${KATIE_LDFLAGS}" PARENT_SCOPE)
+    )
+endmacro()
+
+macro(KATIE_SETUP_TARGET FORTARGET)
+    # targets which use TARGET_OBJECTS are not supported as all-in-one targets
+    cmake_policy(PUSH)
+    if(NOT CMAKE_VERSION VERSION_LESS "3.0.0")
+        cmake_policy(SET CMP0051 OLD)
     endif()
-endfunction()
+
+    set(resourcesdep "${CMAKE_CURRENT_BINARY_DIR}/${FORTARGET}_resources.cpp")
+    if(NOT EXISTS "${resourcesdep}")
+        file(WRITE "${resourcesdep}" "enum { CompilersWorkaroundAlaAutomoc = 1 };\n")
+    endif()
+    get_target_property(targetsources ${FORTARGET} SOURCES)
+    set(targetresources)
+    foreach(tmpres ${targetsources} ${ARGN})
+        get_filename_component(resource ${tmpres} ABSOLUTE)
+        get_source_file_property(skip ${resource} SKIP_RESOURCE)
+        if(NOT skip)
+            get_filename_component(rscext ${resource} EXT)
+            get_filename_component(rscname ${resource} NAME_WE)
+            get_filename_component(rscpath ${resource} PATH)
+            string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" rscpath "${rscpath}")
+            make_directory(${rscpath})
+            if("${rscext}" STREQUAL ".ui")
+                set(rscout "${rscpath}/ui_${rscname}.h")
+                add_custom_command(
+                    OUTPUT "${rscout}"
+                    COMMAND "${KATIE_UIC}" "${resource}" -o "${rscout}"
+                )
+                set(targetresources ${targetresources} ${rscout})
+            elseif("${rscext}" STREQUAL ".qrc")
+                set(rscout "${rscpath}/qrc_${rscname}.cpp")
+                add_custom_command(
+                    OUTPUT "${rscout}"
+                    COMMAND "${KATIE_RCC}" "${resource}" -o "${rscout}" -name "${rscname}"
+                )
+                set(targetresources ${targetresources} ${rscout})
+            elseif("${rscext}" MATCHES "(.h|.cpp|.mm)")
+                file(READ "${resource}" rsccontent)
+                # this can be simpler if continue() was supported by old CMake versions
+                if("${rsccontent}" MATCHES "(Q_OBJECT|Q_OBJECT_FAKE|Q_GADGET)")
+                    set(rscout "${rscpath}/moc_${rscname}${rscext}")
+                    get_directory_property(dirdefs COMPILE_DEFINITIONS)
+                    get_directory_property(dirincs INCLUDE_DIRECTORIES)
+                    set(mocargs)
+                    foreach(ddef ${dirdefs})
+                        # TODO: filter non -D, support -U too
+                        set(mocargs ${mocargs} -D${ddef})
+                    endforeach()
+                    foreach(incdir ${dirincs})
+                        set(mocargs ${mocargs} -I${incdir})
+                    endforeach()
+                    add_custom_command(
+                        OUTPUT "${rscout}"
+                        COMMAND "${KATIE_MOC}" -nw "${resource}" -o "${rscout}" ${mocargs}
+                    )
+                    set(targetresources ${targetresources} ${rscout})
+                    # NOTE: this can be troublesome but common sources can cause multiple
+                    # rules on the same file
+                    set_source_files_properties(${resource} PROPERTIES SKIP_RESOURCE TRUE)
+                endif()
+            endif()
+        endif()
+    endforeach()
+    set_source_files_properties(${resourcesdep} PROPERTIES OBJECT_DEPENDS "${targetresources}")
+
+    if(NOT KATIE_ALLINONE)
+        set_target_properties(${FORTARGET} PROPERTIES SOURCES "${resourcesdep};${targetsources}")
+    # NOTE: blacklisted targets are either failing and too important for other components
+    # (KtCore and KtGui) or use TARGET_OBJECTS expressions which this macro cannot handle
+    elseif("${FORTARGET}" MATCHES "(KtCore|KtGui|KtDesigner|KtDesignerComponents|designer|lconvert|lrelease|lupdate|qcollectiongenerator|qhelpgenerator)")
+        katie_warning("All-in-one build not yet support for: ${FORTARGET}")
+        set_target_properties(${FORTARGET} PROPERTIES SOURCES "${resourcesdep};${targetsources}")
+    else()
+        set(allinonesource "${CMAKE_CURRENT_BINARY_DIR}/${FORTARGET}_allinone.cpp")
+        set(allinonedata)
+        set(targetobjects)
+        foreach(srcstring ${targetsources})
+            get_filename_component(srcname ${srcstring} EXT)
+            if(NOT "${srcname}" MATCHES "(.h|.qrc|.ui)")
+                set(allinonedata "${allinonedata}#include \"${srcstring}\"\n")
+            endif()
+        endforeach()
+        file(WRITE ${allinonesource} "${allinonedata}")
+        set_target_properties(${FORTARGET} PROPERTIES SOURCES "${resourcesdep};${allinonesource}")
+    endif()
+
+    katie_setup_flags(${FORTARGET})
+
+    cmake_policy(POP)
+endmacro()
 
 macro(KATIE_SETUP_OBJECT FORTARGET)
     get_target_property(targets_pic ${FORTARGET} POSITION_INDEPENDENT_CODE)
@@ -193,9 +271,8 @@ macro(KATIE_OPTIMIZE_HEADERS DIR)
 endmacro()
 
 macro(KATIE_TEST TESTNAME TESTSOURCES)
-    katie_resources(${TESTSOURCES} ${ARGN})
-
     add_executable(${TESTNAME} ${TESTSOURCES} ${ARGN})
+    katie_resources(${TESTNAME} ${TESTSOURCES} ${ARGN})
 
     # TODO: make GUI access optional, it is required by many tests so it should still be default
     target_link_libraries(${TESTNAME} KtCore KtGui KtTest)

src/core/CMakeLists.txt

@@ -367,8 +367,6 @@ 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()
 
 add_library(KtCore ${KATIE_TYPE} ${CORE_SOURCES} ${CORE_HEADERS})
@@ -379,6 +377,8 @@ set_target_properties(KtCore PROPERTIES
     EXPORT_NAME Core
 )
 
+katie_setup_target(KtCore)
+
 install(
     TARGETS KtCore
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/core/json/qjsonparser.cpp

@@ -193,7 +193,7 @@ Insignificant whitespace is allowed before or after any of the six
 structural characters.
 
 ws = *(
-          %x20 /              ; Space
+          %x20 /              ; WhiteSpace
           %x09 /              ; Horizontal tab
           %x0A /              ; Line feed or New line
           %x0D                ; Carriage return
@@ -202,7 +202,7 @@ ws = *(
 */
 
 enum {
-   Space = 0x20,
+   WhiteSpace = 0x20,
    Tab = 0x09,
    LineFeed = 0x0a,
    Return = 0x0d,
@@ -230,10 +230,10 @@ void Parser::eatBOM()
 bool Parser::eatSpace()
 {
    while (json < end) {
-      if (*json > Space) {
+      if (*json > WhiteSpace) {
          break;
       }
-      if (*json != Space &&
+      if (*json != WhiteSpace &&
             *json != Tab &&
             *json != LineFeed &&
             *json != Return) {

src/core/thread/qthreadstorage.cpp

@@ -67,13 +67,13 @@ void qtsDebug(const char *fmt, ...)
 }
 #endif
 
-Q_GLOBAL_STATIC(QMutex, mutex)
+Q_GLOBAL_STATIC(QMutex, threadStorageMutex)
 typedef QVector<void (*)(void *)> DestructorMap;
 Q_GLOBAL_STATIC(DestructorMap, destructors)
 
 QThreadStorageData::QThreadStorageData(void (*func)(void *))
 {
-    QMutexLocker locker(mutex());
+    QMutexLocker locker(threadStorageMutex());
     DestructorMap *destr = destructors();
     if (!destr) {
         /*
@@ -111,7 +111,7 @@ QThreadStorageData::~QThreadStorageData()
 #ifdef THREADSTORAGE_DEBUG
     qtsDebug("QThreadStorageData: Released id %d", id);
 #endif
-    QMutexLocker locker(mutex());
+    QMutexLocker locker(threadStorageMutex());
     if (destructors())
         (*destructors())[id] = 0;
 }
@@ -155,7 +155,7 @@ void **QThreadStorageData::set(void *p)
                 id, value, data->thread);
 #endif
 
-        QMutexLocker locker(mutex());
+        QMutexLocker locker(threadStorageMutex());
         DestructorMap *destr = destructors();
         void (*destructor)(void *) = destr ? destr->value(id) : 0;
         locker.unlock();
@@ -178,7 +178,7 @@ void **QThreadStorageData::set(void *p)
 void QThreadStorageData::finish(void **p)
 {
     QVector<void *> *tls = reinterpret_cast<QVector<void *> *>(p);
-    if (!tls || tls->isEmpty() || !mutex())
+    if (!tls || tls->isEmpty() || !threadStorageMutex())
         return; // nothing to do
 
 #ifdef THREADSTORAGE_DEBUG
@@ -196,7 +196,7 @@ void QThreadStorageData::finish(void **p)
             continue;
         }
 
-        QMutexLocker locker(mutex());
+        QMutexLocker locker(threadStorageMutex());
         void (*destructor)(void *) = destructors()->value(i);
         locker.unlock();
 

src/core/tools/qbytearray.cpp

@@ -2231,11 +2231,6 @@ QByteArray QByteArray::repeated(int times) const
     return result;
 }
 
-#define REHASH(a) \
-    if (ol_minus_1 < sizeof(uint) * CHAR_BIT) \
-        hashHaystack -= (a) << ol_minus_1; \
-    hashHaystack <<= 1
-
 /*!
     Returns the index position of the first occurrence of the byte
     array \a ba in this byte array, searching forward from index
@@ -2331,6 +2326,10 @@ int QByteArray::indexOf(char ch, int from) const
     return -1;
 }
 
+#define REHASH(a) \
+    if (ol_minus_1 < sizeof(uint) * CHAR_BIT) \
+        hashHaystack -= (a) << ol_minus_1; \
+    hashHaystack <<= 1
 
 static int lastIndexOfHelper(const char *haystack, int l, const char *needle, int ol, int from)
 {
@@ -2364,6 +2363,7 @@ static int lastIndexOfHelper(const char *haystack, int l, const char *needle, in
     return -1;
 
 }
+#undef REHASH
 
 /*!
     \fn int QByteArray::lastIndexOf(const QByteArray &ba, int from) const

src/core/tools/qbytearraymatcher.cpp

@@ -313,5 +313,6 @@ int qFindByteArray(
     }
     return -1;
 }
+#undef REHASH
 
 QT_END_NAMESPACE

src/core/tools/qlocale.cpp

@@ -41,13 +41,6 @@
 
 #include "qglobal.h"
 
-#ifndef QT_NO_SYSTEMLOCALE
-QT_BEGIN_NAMESPACE
-class QSystemLocale;
-static QSystemLocale *QSystemLocale_globalSystemLocale();
-QT_END_NAMESPACE
-#endif
-
 #if !defined(QWS) && defined(Q_OS_MAC)
 #   include "qcore_mac_p.h"
 #   include <CoreFoundation/CoreFoundation.h>
@@ -79,7 +72,12 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_SYSTEMLOCALE
 static QSystemLocale *_systemLocale = 0;
-Q_GLOBAL_STATIC_WITH_ARGS(QSystemLocale, QSystemLocale_globalSystemLocale, (true))
+class QSystemLocaleSingleton: public QSystemLocale
+{
+public:
+    QSystemLocaleSingleton() : QSystemLocale(true) {}
+};
+Q_GLOBAL_STATIC(QSystemLocaleSingleton, QSystemLocale_globalSystemLocale)
 static QLocalePrivate *system_lp = 0;
 Q_GLOBAL_STATIC(QLocalePrivate, globalLocalePrivate)
 #endif

src/core/tools/qlocale.h

@@ -122,7 +122,7 @@ public:
 
 private:
     QSystemLocale(bool);
-    friend QSystemLocale *QSystemLocale_globalSystemLocale();
+    friend class QSystemLocaleSingleton;
 };
 #endif // QT_NO_SYSTEMLOCALE
 

src/core/tools/qregexp.cpp

@@ -3674,7 +3674,7 @@ uint qHash(const QRegExpEngineKey &key)
 
 typedef QCache<QRegExpEngineKey, QRegExpEngine> EngineCache;
 Q_GLOBAL_STATIC(EngineCache, globalEngineCache)
-Q_GLOBAL_STATIC(QMutex, mutex)
+Q_GLOBAL_STATIC(QMutex, regexpMutex)
 #endif // QT_NO_REGEXP_OPTIM
 
 static void derefEngine(QRegExpEngine *eng, const QRegExpEngineKey &key)
@@ -3682,7 +3682,7 @@ static void derefEngine(QRegExpEngine *eng, const QRegExpEngineKey &key)
     if (!eng->ref.deref()) {
 #if !defined(QT_NO_REGEXP_OPTIM)
         if (globalEngineCache()) {
-            QMutexLocker locker(mutex());
+            QMutexLocker locker(regexpMutex());
             QT_TRY {
                 globalEngineCache()->insert(key, eng, 4 + key.pattern.length() / 4);
             } QT_CATCH(const std::bad_alloc &) {
@@ -3704,7 +3704,7 @@ static void prepareEngine_helper(QRegExpPrivate *priv)
     bool initMatchState = !priv->eng;
 #if !defined(QT_NO_REGEXP_OPTIM)
     if (!priv->eng && globalEngineCache()) {
-        QMutexLocker locker(mutex());
+        QMutexLocker locker(regexpMutex());
         priv->eng = globalEngineCache()->take(priv->engineKey);
         if (priv->eng != 0)
             priv->eng->ref.ref();

src/dbus/CMakeLists.txt

@@ -124,8 +124,6 @@ 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()
 
 add_library(KtDBus ${KATIE_TYPE} ${DBUS_SOURCES} ${DBUS_HEADERS})
@@ -136,6 +134,8 @@ set_target_properties(KtDBus PROPERTIES
     EXPORT_NAME DBus
 )
 
+katie_setup_target(KtDBus)
+
 install(
     TARGETS KtDBus
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/declarative/CMakeLists.txt

@@ -74,8 +74,6 @@ 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()
 
 add_library(KtDeclarative ${KATIE_TYPE} ${DECLARATIVE_SOURCES} ${DECLARATIVE_HEADERS})
@@ -86,6 +84,8 @@ set_target_properties(KtDeclarative PROPERTIES
     EXPORT_NAME Declarative
 )
 
+katie_setup_target(KtDeclarative)
+
 install(
     TARGETS KtDeclarative
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/designer/CMakeLists.txt

@@ -115,8 +115,6 @@ 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()
 
 add_library(KtDesigner ${KATIE_TYPE}
@@ -132,6 +130,7 @@ set_target_properties(KtDesigner PROPERTIES
     EXPORT_NAME Designer
 )
 
+katie_setup_target(KtDesigner)
 katie_setup_object(KtDesigner sharedqtgradienteditor sharedqtpropertybrowser shareddeviceskin sharedfindwidget)
 
 install(

src/designer/components/CMakeLists.txt

@@ -80,8 +80,6 @@ endif()
 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()
 
 add_library(KtDesignerComponents ${KATIE_TYPE}
@@ -97,6 +95,7 @@ set_target_properties(KtDesignerComponents PROPERTIES
     EXPORT_NAME DesignerComponents
 )
 
+katie_setup_target(KtDesignerComponents)
 katie_setup_object(KtDesignerComponents sharedfindwidget sharedqtpropertybrowser sharedqtgradienteditor)
 
 install(

src/gui/CMakeLists.txt

@@ -499,8 +499,6 @@ 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()
 
 add_library(KtGui ${KATIE_TYPE} ${GUI_SOURCES} ${GUI_HEADERS})
@@ -511,6 +509,8 @@ set_target_properties(KtGui PROPERTIES
     EXPORT_NAME Gui
 )
 
+katie_setup_target(KtGui)
+
 install(
     TARGETS KtGui
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/help/CMakeLists.txt

@@ -90,8 +90,6 @@ 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()
 
 add_library(KtHelp ${KATIE_TYPE} ${HELP_SOURCES} ${HELP_HEADERS})
@@ -102,6 +100,8 @@ set_target_properties(KtHelp PROPERTIES
     EXPORT_NAME Help
 )
 
+katie_setup_target(KtHelp)
+
 install(
     TARGETS KtHelp
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/imports/CMakeLists.txt

@@ -1,8 +1,6 @@
 # add_definitions()
 set(EXTRA_IMPORTS_LIBS KtCore)
 
-katie_setup_flags()
-
 include_directories(
     ${CMAKE_BINARY_DIR}/include
     ${CMAKE_BINARY_DIR}/privateinclude

src/imports/folderlistmodel/folderlistmodel.cmake

@@ -10,13 +10,13 @@ set(FOLDERLISTMODEL_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/folderlistmodel/qdeclarativefolderlistmodel.h
 )
 
-katie_resources(${FOLDERLISTMODEL_SOURCES} ${FOLDERLISTMODEL_HEADERS})
-katie_setup_flags()
 katie_setup_paths()
 
 add_library(qmlfolderlistmodelplugin ${KATIE_TYPE} ${FOLDERLISTMODEL_SOURCES} ${FOLDERLISTMODEL_HEADERS})
 target_link_libraries(qmlfolderlistmodelplugin ${EXTRA_FOLDERLISTMODEL_LIBS})
 
+katie_setup_target(qmlfolderlistmodelplugin)
+
 install(
     TARGETS qmlfolderlistmodelplugin
     DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/folderlistmodel

src/imports/gestures/gestures.cmake

@@ -10,13 +10,13 @@ set(GESTURES_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/gestures/qdeclarativegesturearea_p.h
 )
 
-katie_resources(${GESTURES_SOURCES} ${GESTURES_HEADERS})
-katie_setup_flags()
 katie_setup_paths()
 
 add_library(qmlgesturesplugin ${KATIE_TYPE} ${GESTURES_SOURCES} ${GESTURES_HEADERS})
 target_link_libraries(qmlgesturesplugin ${EXTRA_GESTURES_LIBS})
 
+katie_setup_target(qmlgesturesplugin)
+
 install(
     TARGETS qmlgesturesplugin
     DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/gestures

src/imports/particles/particles.cmake

@@ -10,14 +10,13 @@ set(PARTICLES_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/particles/qdeclarativeparticles_p.h
 )
 
-katie_resources("${PARTICLES_SOURCES}")
-katie_resources("${PARTICLES_HEADERS}")
-katie_setup_flags()
 katie_setup_paths()
 
 add_library(qmlparticlesplugin ${KATIE_TYPE} ${PARTICLES_SOURCES} ${PARTICLES_HEADERS})
 target_link_libraries(qmlparticlesplugin ${EXTRA_PARTICLES_LIBS})
 
+katie_setup_target(qmlparticlesplugin)
+
 install(
     TARGETS qmlparticlesplugin
     DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/particles

src/imports/shaders/shaders.cmake

@@ -22,13 +22,13 @@ set(SHADERS_HEADERS
 
 include_directories(${OPENGL_INCLUDE_DIR})
 
-katie_resources(${SHADERS_SOURCES} ${SHADERS_HEADERS})
-katie_setup_flags()
 katie_setup_paths()
 
 add_library(qmlshadersplugin ${KATIE_TYPE} ${SHADERS_SOURCES} ${SHADERS_HEADERS})
 target_link_libraries(qmlshadersplugin ${EXTRA_SHADERS_LIBS})
 
+katie_setup_target(qmlshadersplugin)
+
 install(
     TARGETS qmlshadersplugin
     DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/shaders

src/multimedia/CMakeLists.txt

@@ -40,8 +40,6 @@ 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()
 
 add_library(KtMultimedia ${KATIE_TYPE} ${MULTIMEDIA_SOURCES} ${MULTIMEDIA_HEADERS})
@@ -52,6 +50,8 @@ set_target_properties(KtMultimedia PROPERTIES
     EXPORT_NAME Multimedia
 )
 
+katie_setup_target(KtMultimedia)
+
 install(
     TARGETS KtMultimedia
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/network/CMakeLists.txt

@@ -84,8 +84,6 @@ 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()
 
 add_library(KtNetwork ${KATIE_TYPE} ${NETWORK_SOURCES} ${NETWORK_HEADERS})
@@ -96,6 +94,8 @@ set_target_properties(KtNetwork PROPERTIES
     EXPORT_NAME Network
 )
 
+katie_setup_target(KtNetwork)
+
 install(
     TARGETS KtNetwork
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/opengl/CMakeLists.txt

@@ -190,8 +190,6 @@ 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()
 
 add_library(KtOpenGL ${KATIE_TYPE} ${OPENGL_SOURCES} ${OPENGL_HEADERS})
@@ -202,6 +200,8 @@ set_target_properties(KtOpenGL PROPERTIES
     EXPORT_NAME OpenGL
 )
 
+katie_setup_target(KtOpenGL)
+
 install(
     TARGETS KtOpenGL
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/plugins/CMakeLists.txt

@@ -1,7 +1,6 @@
 add_definitions(-DQT_PLUGIN)
 set(EXTRA_PLUGINS_LIBS KtCore)
 
-katie_setup_flags()
 katie_setup_paths()
 
 include_directories(

src/plugins/bearer/blackberry/blackberry.cmake

@@ -15,11 +15,11 @@ set(QBBBEARERPLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qnetworksession_impl.cpp
 )
 
-katie_resources(${QBBBEARER_HEADERS} ${QBBBEARERPLUGIN_SOURCES})
-
 add_library(qbbbearerplugin MODULE ${QBBBEARERPLUGIN_SOURCES} ${QBBBEARER_HEADERS})
 set_target_properties(qbbbearerplugin PROPERTIES OUTPUT_NAME qbbbearer)
 
+katie_setup_target(qbbbearerplugin)
+
 install(
     TARGETS qbbbearerplugin
     DESTINATION ${QT_PLUGINS_PATH}/bearer

src/plugins/bearer/connman/connman.cmake

@@ -20,12 +20,15 @@ set(QTCONNMANBEARERPLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qnetworksession_impl.cpp
 )
 
-katie_resources(${QTCONNMANBEARERPLUGIN_HEADERS} ${QTCONNMANBEARERPLUGIN_SOURCES})
-
 add_library(qconnmanbearerplugin MODULE ${QTCONNMANBEARERPLUGIN_SOURCES} ${QTCONNMANBEARERPLUGIN_HEADERS})
 target_link_libraries(qconnmanbearerplugin KtCore KtNetwork KtDBus)
 set_target_properties(qconnmanbearerplugin PROPERTIES OUTPUT_NAME qconnmanbearer)
-target_include_directories(qconnmanbearerplugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bearer/connman ${CMAKE_CURRENT_SOURCE_DIR}/bearer)
+target_include_directories(qconnmanbearerplugin PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/bearer/connman
+    ${CMAKE_CURRENT_SOURCE_DIR}/bearer
+)
+
+katie_setup_target(qconnmanbearerplugin)
 
 install(
     TARGETS qconnmanbearerplugin

src/plugins/bearer/corewlan/corewlan.cmake

@@ -12,14 +12,14 @@ set(QCOREWLANBEARERPLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qnetworksession_impl.cpp
 )
 
-katie_resources(${QCOREWLANBEARERPLUGIN_HEADERS} ${QCOREWLANBEARERPLUGIN_SOURCES})
-
 add_library(qcorewlanbearerplugin MODULE ${QCOREWLANBEARERPLUGIN_SOURCES} ${QCOREWLANBEARERPLUGIN_HEADERS})
 set_target_properties(qcorewlanbearerplugin PROPERTIES OUTPUT_NAME qcorewlanbearer)
 set_target_properties(qcorewlanbearerplugin PROPERTIES
     LINK_FLAGS "-framework Foundation -framework SystemConfiguration -framework CoreWLAN -framework Security"
 )
 
+katie_setup_target(qcorewlanbearerplugin)
+
 install(
     TARGETS qcorewlanbearerplugin
     DESTINATION ${QT_PLUGINS_PATH}/bearer

src/plugins/bearer/generic/generic.cmake

@@ -18,12 +18,12 @@ set(QGENERICBEARERPLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qnetworksession_impl.cpp
 )
 
-katie_resources(${QGENERICBEARERPLUGIN_HEADERS} ${QGENERICBEARERPLUGIN_SOURCES})
-
 add_library(qgenericbearerplugin MODULE ${QGENERICBEARERPLUGIN_SOURCES} ${QGENERICBEARERPLUGIN_HEADERS})
 target_link_libraries(qgenericbearerplugin KtCore KtNetwork)
 set_target_properties(qgenericbearerplugin PROPERTIES OUTPUT_NAME qgenericbearer)
 
+katie_setup_target(qgenericbearerplugin)
+
 install(
     TARGETS qgenericbearerplugin
     DESTINATION ${QT_PLUGINS_PATH}/bearer

src/plugins/bearer/icd/icd.cmake

@@ -24,12 +24,13 @@ set(ICDPLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/bearer/icd/proxyconf.cpp
 )
 
-katie_resources(${ICDPLUGIN_HEADERS} ${ICDPLUGIN_SOURCES})
 
 add_library(qicdbearerplugin MODULE ${ICDPLUGIN_SOURCES} ${ICDPLUGIN_HEADERS})
 set_target_properties(qicdbearerplugin PROPERTIES OUTPUT_NAME qicdbearer)
 target_include_directories(qicdbearerplugin PRIVATE ${CMAKE_SOURCE_DIR}/src/3rdparty/libgq)
 
+katie_setup_target(qicdbearerplugin)
+
 install(
     TARGETS qicdbearerplugin
     DESTINATION ${QT_PLUGINS_PATH_INST}/bearer

src/plugins/bearer/nativewifi/nativewifi.cmake

@@ -18,12 +18,12 @@ set(QNATIVEWIFIPLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qnetworksession_impl.cpp
 )
 
-katie_resources(${QNATIVEWIFIPLUGIN_HEADERS} ${QNATIVEWIFIPLUGIN_SOURCES})
-
 add_library(qnativewifibearerplugin MODULE ${QNATIVEWIFIPLUGIN_SOURCES} ${QNATIVEWIFIPLUGIN_HEADERS})
 target_link_libraries(qnativewifibearerplugin KtCore KtNetwork)
 set_target_properties(qnativewifibearerplugin PROPERTIES OUTPUT_NAME qnativewifibearer)
 
+katie_setup_target(qnativewifibearerplugin)
+
 install(
     TARGETS qnativewifibearerplugin
     DESTINATION ${QT_PLUGINS_PATH}/bearer

src/plugins/bearer/networkmanager/networkmanager.cmake

@@ -20,12 +20,12 @@ set(QNMBEARERPLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qnetworksession_impl.cpp
 )
 
-katie_resources(${QNMBEARERPLUGIN_HEADERS} ${QNMBEARERPLUGIN_SOURCES})
-
 add_library(qnmbearerplugin MODULE ${QNMBEARERPLUGIN_SOURCES} ${QNMBEARERPLUGIN_HEADERS})
 target_link_libraries(qnmbearerplugin KtCore KtNetwork KtDBus)
 set_target_properties(qnmbearerplugin PROPERTIES OUTPUT_NAME qnmbearer)
 
+katie_setup_target(qnmbearerplugin)
+
 install(
     TARGETS qnmbearerplugin
     DESTINATION ${QT_PLUGINS_PATH}/bearer

src/plugins/designer/qdeclarativeview/qdeclarativeview.cmake

@@ -10,13 +10,13 @@ set(QDECLARATIVEVIEWPLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/designer/qdeclarativeview/qdeclarativeview_plugin.cpp
 )
 
-katie_resources(${QDECLARATIVEVIEWPLUGIN_HEADERS} ${QDECLARATIVEVIEWPLUGIN_SOURCES})
-
 add_library(qdeclarativeviewplugin MODULE ${QDECLARATIVEVIEWPLUGIN_SOURCES} ${QDECLARATIVEVIEWPLUGIN_HEADERS})
 target_link_libraries(qdeclarativeviewplugin KtCore KtDeclarative KtDesigner)
 set_target_properties(qdeclarativeviewplugin PROPERTIES OUTPUT_NAME qdeclarativeview)
 target_compile_definitions(qdeclarativeviewplugin PRIVATE -DQDESIGNER_SDK_LIBRARY)
 
+katie_setup_target(qdeclarativeviewplugin)
+
 install(
     TARGETS qdeclarativeviewplugin
     DESTINATION ${QT_PLUGINS_PATH}/designer

src/plugins/graphicssystems/meego/meego.cmake

@@ -24,11 +24,11 @@ set(QMEEGOGRAPHICSSYSTEMPLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/graphicssystems/meego/dithering.cpp
 )
 
-katie_resources(${QMEEGOGRAPHICSSYSTEMPLUGIN_HEADERS} ${QMEEGOGRAPHICSSYSTEMPLUGIN_SOURCES})
-
 add_library(qmeegographicssystemplugin MODULE ${QMEEGOGRAPHICSSYSTEMPLUGIN_SOURCES} ${QMEEGOGRAPHICSSYSTEMPLUGIN_HEADERS})
 set_target_properties(qmeegographicssystemplugin PROPERTIES OUTPUT_NAME qmeegographicssystem)
 
+katie_setup_target(qmeegographicssystemplugin)
+
 install(
     TARGETS qmeegographicssystemplugin
     DESTINATION ${QT_PLUGINS_PATH}/graphicssystems

src/plugins/graphicssystems/opengl/opengl.cmake

@@ -5,12 +5,12 @@ set(QGLGRAPHICSSYSTEMPLUGIN_SOURCES
 
 include_directories(${OPENGL_INCLUDE_DIR})
 
-katie_resources(${QGLGRAPHICSSYSTEMPLUGIN_SOURCES})
-
 add_library(qglgraphicssystemplugin MODULE ${QGLGRAPHICSSYSTEMPLUGIN_SOURCES})
 target_link_libraries(qglgraphicssystemplugin KtCore KtGui KtOpenGL)
 set_target_properties(qglgraphicssystemplugin PROPERTIES OUTPUT_NAME qglgraphicssystem)
 
+katie_setup_target(qglgraphicssystemplugin)
+
 install(
     TARGETS qglgraphicssystemplugin
     DESTINATION ${QT_PLUGINS_PATH}/graphicssystems

src/plugins/iconengines/svgiconengine/svgiconengine.cmake

@@ -9,12 +9,12 @@ set(QSVGICONPLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/iconengines/svgiconengine/qsvgiconengine.cpp
 )
 
-katie_resources(${QSVGICONPLUGIN_HEADERS} ${QSVGICONPLUGIN_SOURCES})
-
 add_library(qsvgiconplugin MODULE ${QSVGICONPLUGIN_SOURCES} ${QSVGICONPLUGIN_HEADERS})
 target_link_libraries(qsvgiconplugin KtCore KtGui KtSvg)
 set_target_properties(qsvgiconplugin PROPERTIES OUTPUT_NAME qsvgicon)
 
+katie_setup_target(qsvgiconplugin)
+
 install(
     TARGETS qsvgiconplugin
     DESTINATION ${QT_PLUGINS_PATH}/iconengines

src/plugins/inputmethods/imsw-multi/imsw-multi.cmake

@@ -14,12 +14,12 @@ set(QIMSWMULTIPLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp
 )
 
-katie_resources(${QIMSWMULTIPLUGIN_HEADERS} ${QIMSWMULTIPLUGIN_SOURCES})
-
 add_library(qimsw-multiplugin MODULE ${QIMSWMULTIPLUGIN_SOURCES} ${QIMSWMULTIPLUGIN_HEADERS})
 target_link_libraries(qimsw-multiplugin KtCore KtGui)
 set_target_properties(qimsw-multiplugin PROPERTIES OUTPUT_NAME qimsw-multi)
 
+katie_setup_target(qimsw-multiplugin)
+
 install(
     TARGETS qimsw-multiplugin
     DESTINATION ${QT_PLUGINS_PATH}/inputmethods

src/plugins/script/qtdbus/qtdbus.cmake

@@ -12,13 +12,13 @@ set(QTDBUSPLUGIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/script/qtdbus/dbmain.cpp
 )
 
-katie_resources(${QTDBUSPLUGIN_HEADERS})
-
 add_library(qtscriptdbusplugin MODULE ${QTDBUSPLUGIN_SOURCES} ${QTDBUSPLUGIN_HEADERS})
 target_link_libraries(qtscriptdbusplugin KtCore KtDBus KtScript)
 set_target_properties(qtscriptdbusplugin PROPERTIES OUTPUT_NAME qtscriptdbus)
 target_include_directories(qtscriptdbusplugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/script/qtdbus)
 
+katie_setup_target(qtscriptdbusplugin)
+
 install(
     TARGETS qtscriptdbusplugin
     DESTINATION ${QT_PLUGINS_PATH}/script

src/plugins/sqldrivers/mysql/mysql.cmake

@@ -13,12 +13,12 @@ set(MYSQLCDRIVER_SOURCES
 
 include_directories(${MYSQL_INCLUDES})
 
-katie_resources(${MYSQLCDRIVER_SOURCES} ${MYSQLCDRIVER_HEADERS})
-
 add_library(qsqlmysqlplugin MODULE ${MYSQLCDRIVER_SOURCES} ${MYSQLCDRIVER_HEADERS})
 target_link_libraries(qsqlmysqlplugin KtSql ${MYSQL_LIBRARIES})
 set_target_properties(qsqlmysqlplugin PROPERTIES OUTPUT_NAME qsqlmysql)
 
+katie_setup_target(qsqlmysqlplugin)
+
 install(
     TARGETS qsqlmysqlplugin
     DESTINATION ${QT_PLUGINS_PATH}/sqldrivers

src/plugins/sqldrivers/odbc/odbc.cmake

@@ -13,8 +13,6 @@ set(ODBCDRIVER_SOURCES
 
 include_directories(${ODBC_INCLUDES})
 
-katie_resources(${ODBCDRIVER_SOURCES} ${ODBCDRIVER_HEADERS})
-
 add_library(qsqlodbcplugin MODULE ${ODBCDRIVER_SOURCES} ${ODBCDRIVER_HEADERS})
 target_link_libraries(qsqlodbcplugin KtSql ${ODBC_LIBRARIES})
 set_target_properties(qsqlodbcplugin PROPERTIES OUTPUT_NAME qsqlodbc)
@@ -22,6 +20,8 @@ if(UNIX)
     target_compile_definitions(qsqlodbcplugin PRIVATE -DUNICODE)
 endif()
 
+katie_setup_target(qsqlodbcplugin)
+
 install(
     TARGETS qsqlodbcplugin
     DESTINATION ${QT_PLUGINS_PATH}/sqldrivers

src/plugins/sqldrivers/psql/psql.cmake

@@ -13,12 +13,12 @@ set(PSQLDRIVER_SOURCES
 
 include_directories(${PostgreSQL_INCLUDE_DIRS})
 
-katie_resources(${PSQLDRIVER_SOURCES} ${PSQLDRIVER_HEADERS})
-
 add_library(qsqlpsqlplugin MODULE ${PSQLDRIVER_SOURCES} ${PSQLDRIVER_HEADERS})
 target_link_libraries(qsqlpsqlplugin KtSql ${PostgreSQL_LIBRARIES})
 set_target_properties(qsqlpsqlplugin PROPERTIES OUTPUT_NAME qsqlpsql)
 
+katie_setup_target(qsqlpsqlplugin)
+
 install(
     TARGETS qsqlpsqlplugin
     DESTINATION ${QT_PLUGINS_PATH}/sqldrivers

src/plugins/sqldrivers/sqlite/sqlite.cmake

@@ -21,8 +21,6 @@ else()
     include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/sqlite3)
 endif()
 
-katie_resources(${SQLDRIVER_SOURCES} ${SQLDRIVER_HEADERS})
-
 add_library(qsqliteplugin MODULE ${SQLDRIVER_SOURCES} ${SQLDRIVER_HEADERS})
 if(SQLITE_FOUND)
     target_link_libraries(qsqliteplugin KtSql ${SQLITE_LIBRARIES})
@@ -31,6 +29,8 @@ else()
 endif()
 set_target_properties(qsqliteplugin PROPERTIES OUTPUT_NAME qsqlite)
 
+katie_setup_target(qsqliteplugin)
+
 install(
     TARGETS qsqliteplugin
     DESTINATION ${QT_PLUGINS_PATH}/sqldrivers

src/script/CMakeLists.txt

@@ -269,8 +269,6 @@ 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()
 
 add_library(KtScript ${KATIE_TYPE} ${SCRIPT_SOURCES} ${SCRIPT_HEADERS})
@@ -281,6 +279,8 @@ set_target_properties(KtScript PROPERTIES
     EXPORT_NAME Script
 )
 
+katie_setup_target(KtScript)
+
 install(
     TARGETS KtScript
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/scripttools/CMakeLists.txt

@@ -26,8 +26,6 @@ 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()
 
 add_library(KtScriptTools ${KATIE_TYPE} ${SCRIPTTOOLS_SOURCES} ${SCRIPTTOOLS_HEADERS})
@@ -38,6 +36,8 @@ set_target_properties(KtScriptTools PROPERTIES
     EXPORT_NAME ScriptTools
 )
 
+katie_setup_target(KtScriptTools)
+
 install(
     TARGETS KtScriptTools
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/shared/deviceskin/deviceskin.cmake

@@ -33,10 +33,8 @@ set(SHAREDDEVICESKIN_SOURCES
 set(SHAREDDEVICESKIN_HEADERS
     ${SHAREDDEVICESKIN_HEADERS}
     ${CMAKE_SOURCE_DIR}/src/shared/deviceskin/deviceskin.h
-) 
+)
 
-katie_resources(${SHAREDDEVICESKIN_SOURCES})
-katie_resources(${SHAREDDEVICESKIN_HEADERS})
 katie_resource(
     ${CMAKE_SOURCE_DIR}/src/shared/deviceskin/deviceskin.cpp
     "${SHAREDDEVICESKIN_RESOURCES}"
@@ -47,4 +45,4 @@ add_library(shareddeviceskin OBJECT ${SHAREDDEVICESKIN_SOURCES} ${SHAREDDEVICESK
 target_compile_definitions(shareddeviceskin PRIVATE ${SHAREDDEVICESKIN_DEFINITIONS})
 target_include_directories(shareddeviceskin PRIVATE ${SHAREDDEVICESKIN_INCLUDES})
 
-katie_setup_flags(shareddeviceskin)
+katie_setup_target(shareddeviceskin)

src/shared/findwidget/findwidget.cmake

@@ -29,11 +29,8 @@ set(SHAREDFINDWIDGET_HEADERS
     ${CMAKE_SOURCE_DIR}/src/shared/findwidget/itemviewfindwidget.h
 )
 
-katie_resources(${SHAREDFINDWIDGET_SOURCES})
-katie_resources(${SHAREDFINDWIDGET_HEADERS})
-
 add_library(sharedfindwidget OBJECT ${SHAREDFINDWIDGET_SOURCES} ${SHAREDFINDWIDGET_HEADERS})
 target_compile_definitions(sharedfindwidget PRIVATE ${SHAREDFINDWIDGET_DEFINITIONS})
 target_include_directories(sharedfindwidget PRIVATE ${SHAREDFINDWIDGET_INCLUDES})
 
-katie_setup_flags(sharedfindwidget)
+katie_setup_target(sharedfindwidget)

src/shared/help/help.cmake

@@ -22,12 +22,10 @@ set(SHAREDHELP_HEADERS
     ${SHAREDHELP_HEADERS}
     ${CMAKE_SOURCE_DIR}/src/shared/help/collectionconfiguration.h
     ${CMAKE_SOURCE_DIR}/src/shared/help/helpgenerator.h
-) 
+)
-
-katie_resources(${SHAREDHELP_SOURCES} ${SHAREDHELP_HEADERS})
 
 add_library(sharedhelp OBJECT ${SHAREDHELP_SOURCES} ${SHAREDHELP_HEADERS})
 target_compile_definitions(sharedhelp PRIVATE ${SHAREDHELP_DEFINITIONS})
 target_include_directories(sharedhelp PRIVATE ${SHAREDHELP_INCLUDES})
 
-katie_setup_flags(sharedhelp)
+katie_setup_target(sharedhelp)

src/shared/linguist/linguist.cmake

@@ -38,4 +38,4 @@ add_library(sharedlinguist OBJECT ${SHAREDLINGUIST_SOURCES})
 target_compile_definitions(sharedlinguist PRIVATE ${SHAREDLINGUIST_DEFINITIONS})
 target_include_directories(sharedlinguist PRIVATE ${SHAREDLINGUIST_INCLUDES})
 
-katie_setup_flags(sharedlinguist)
+katie_setup_target(sharedlinguist)

src/shared/qclass_lib_map.h

@@ -96,6 +96,7 @@ static const ClassInfoEntry qclass_lib_map[] = {
     { "QCharRef", "QtCore/qstring.h"},
     { "QStringRef", "QtCore/qstring.h"},
     { "QAbstractConcatenable", "QtCore/qstringbuilder.h"},
+    { "QStringList", "QtCore/qstringlist.h"},
     { "QStringMatcher", "QtCore/qstringmatcher.h"},
     { "QTextBoundaryFinder", "QtCore/qtextboundaryfinder.h"},
     { "QTimeLine", "QtCore/qtimeline.h"},
@@ -781,6 +782,6 @@ static const ClassInfoEntry qclass_lib_map[] = {
     { "QSslKey", "QtNetwork/qsslkey.h"},
     { "QSslSocket", "QtNetwork/qsslsocket.h"},
 };
-static const int qclass_lib_count = 775;
+static const int qclass_lib_count = 776;
 
 #endif

src/shared/qtgradienteditor/qtgradienteditor.cmake

@@ -54,11 +54,8 @@ set(SHAREDGRADIENDEDITOR_HEADERS
     ${CMAKE_SOURCE_DIR}/src/shared/qtgradienteditor/qtcolorbutton.h
 )
 
-katie_resources(${SHAREDGRADIENDEDITOR_SOURCES})
-katie_resources(${SHAREDGRADIENDEDITOR_HEADERS})
-
 add_library(sharedqtgradienteditor OBJECT ${SHAREDGRADIENDEDITOR_SOURCES} ${SHAREDGRADIENDEDITOR_HEADERS})
 target_compile_definitions(sharedqtgradienteditor PRIVATE ${SHAREDGRADIENDEDITOR_DEFINITIONS})
 target_include_directories(sharedqtgradienteditor PRIVATE ${SHAREDGRADIENDEDITOR_INCLUDES})
 
-katie_setup_flags(sharedqtgradienteditor)
+katie_setup_target(sharedqtgradienteditor)

src/shared/qtpropertybrowser/qtpropertybrowser.cmake

@@ -39,11 +39,8 @@ set(SHAREDPROPERTYBROWSER_HEADERS
     ${CMAKE_SOURCE_DIR}/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
 )
 
-katie_resources(${SHAREDPROPERTYBROWSER_SOURCES})
-katie_resources(${SHAREDPROPERTYBROWSER_HEADERS})
-
 add_library(sharedqtpropertybrowser OBJECT ${SHAREDPROPERTYBROWSER_SOURCES} ${SHAREDPROPERTYBROWSER_HEADERS})
 target_compile_definitions(sharedqtpropertybrowser PRIVATE ${SHAREDPROPERTYBROWSER_DEFINITIONS})
 target_include_directories(sharedqtpropertybrowser PRIVATE ${SHAREDPROPERTYBROWSER_INCLUDES})
 
-katie_setup_flags(sharedqtpropertybrowser)
+katie_setup_target(sharedqtpropertybrowser)

src/sql/CMakeLists.txt

@@ -64,8 +64,6 @@ 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()
 
 add_library(KtSql ${KATIE_TYPE} ${SQL_SOURCES} ${SQL_HEADERS})
@@ -76,6 +74,8 @@ set_target_properties(KtSql PROPERTIES
     EXPORT_NAME Sql
 )
 
+katie_setup_target(KtSql)
+
 install(
     TARGETS KtSql
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/svg/CMakeLists.txt

@@ -71,8 +71,6 @@ 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()
 
 add_library(KtSvg ${KATIE_TYPE} ${SVG_SOURCES} ${SVG_HEADERS})
@@ -83,6 +81,8 @@ set_target_properties(KtSvg PROPERTIES
     EXPORT_NAME Svg
 )
 
+katie_setup_target(KtSvg)
+
 install(
     TARGETS KtSvg
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/test/CMakeLists.txt

@@ -130,8 +130,6 @@ 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()
 
 add_library(KtTest ${KATIE_TYPE} ${TEST_SOURCES} ${TEST_HEADERS})
@@ -142,6 +140,8 @@ set_target_properties(KtTest PROPERTIES
     EXPORT_NAME Test
 )
 
+katie_setup_target(KtTest)
+
 install(
     TARGETS KtTest
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/designer/CMakeLists.txt

@@ -101,8 +101,6 @@ configure_file(
     @ONLY
 )
 
-katie_resources(${DESIGNERBIN_SOURCES} ${DESIGNERBIN_HEADERS})
-katie_setup_flags()
 katie_setup_paths()
 
 add_executable(designer
@@ -112,6 +110,8 @@ add_executable(designer
 )
 target_link_libraries(designer ${EXTRA_DESIGNERBIN_LIBS})
 
+katie_setup_target(designer)
+
 install(
     TARGETS designer
     RUNTIME DESTINATION ${QT_BINARIES_PATH}

src/tools/idc/CMakeLists.txt

@@ -13,12 +13,13 @@ set(IDC_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
 
-katie_setup_flags()
 katie_setup_paths()
 
 add_executable(idc ${IDC_SOURCES})
 target_link_libraries(idc ${EXTRA_IDC_LIBS})
 
+katie_setup_target(idc)
+
 install(
     TARGETS idc
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/lconvert/CMakeLists.txt

@@ -25,12 +25,13 @@ set(LCONVERT_HEADERS
     ${SHAREDLINGUIST_HEADERS}
 )
 
-katie_setup_flags()
 katie_setup_paths()
 
 add_executable(lconvert $<TARGET_OBJECTS:sharedlinguist> ${LCONVERT_SOURCES} ${LCONVERT_HEADERS})
 target_link_libraries(lconvert ${EXTRA_LCONVERT_LIBS})
 
+katie_setup_target(lconvert)
+
 install(
     TARGETS lconvert
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/lrelease/CMakeLists.txt

@@ -25,12 +25,13 @@ set(LRELEASE_HEADERS
     ${SHAREDLINGUIST_HEADERS}
 )
 
-katie_setup_flags()
 katie_setup_paths()
 
 add_executable(lrelease $<TARGET_OBJECTS:sharedlinguist> ${LRELEASE_SOURCES} ${LRELEASE_HEADERS})
 target_link_libraries(lrelease ${EXTRA_LRELEASE_LIBS})
 
+katie_setup_target(lrelease)
+
 install(
     TARGETS lrelease
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/lupdate/CMakeLists.txt

@@ -26,12 +26,13 @@ set(LUPDATE_HEADERS
     ${SHAREDLINGUIST_HEADERS}
 )
 
-katie_setup_flags()
 katie_setup_paths()
 
 add_executable(lupdate $<TARGET_OBJECTS:sharedlinguist> ${LUPDATE_SOURCES} ${LUPDATE_HEADERS})
 target_link_libraries(lupdate ${EXTRA_LUPDATE_LIBS})
 
+katie_setup_target(lupdate)
+
 install(
     TARGETS lupdate
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/moc/CMakeLists.txt

@@ -30,7 +30,6 @@ if(KATIE_PLATFORM STREQUAL "mac")
     )
 endif()
 
-katie_setup_flags()
 katie_setup_paths()
 
 add_executable(bootstrap_moc $<TARGET_OBJECTS:bootstrap> ${MOC_SOURCES})
@@ -39,6 +38,9 @@ target_compile_definitions(bootstrap_moc PRIVATE ${BOOTSTRAP_DEFINITIONS})
 add_executable(moc ${MOC_SOURCES})
 target_link_libraries(moc ${EXTRA_MOC_LIBS})
 
+katie_setup_flags(bootstrap_moc)
+katie_setup_flags(moc)
+
 install(
     TARGETS moc
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/qcollectiongenerator/CMakeLists.txt

@@ -27,13 +27,17 @@ set(QCOLLECTIONGENERATOR_HEADERS
     ${SHAREDHELP_HEADERS}
 )
 
-katie_resources(${QCOLLECTIONGENERATOR_SOURCES} ${QCOLLECTIONGENERATOR_HEADERS})
-katie_setup_flags()
 katie_setup_paths()
 
-add_executable(qcollectiongenerator $<TARGET_OBJECTS:sharedhelp> ${QCOLLECTIONGENERATOR_SOURCES} ${QCOLLECTIONGENERATOR_HEADERS})
+add_executable(qcollectiongenerator
+    $<TARGET_OBJECTS:sharedhelp>
+    ${QCOLLECTIONGENERATOR_SOURCES}
+    ${QCOLLECTIONGENERATOR_HEADERS}
+)
 target_link_libraries(qcollectiongenerator ${EXTRA_QCOLLECTIONGENERATOR_LIBS})
 
+katie_setup_target(qcollectiongenerator)
+
 install(
     TARGETS qcollectiongenerator
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/qdbus/CMakeLists.txt

@@ -12,7 +12,6 @@ include_directories(
     ${CMAKE_BINARY_DIR}/privateinclude/QtDBus
 )
 
-katie_setup_flags()
 katie_setup_paths()
 
 add_executable(qdbus ${CMAKE_CURRENT_SOURCE_DIR}/qdbus.cpp)
@@ -24,6 +23,10 @@ target_link_libraries(qdbuscpp2xml ${EXTRA_QDBUS_LIBS})
 add_executable(qdbusxml2cpp ${CMAKE_CURRENT_SOURCE_DIR}/qdbusxml2cpp.cpp)
 target_link_libraries(qdbusxml2cpp ${EXTRA_QDBUS_LIBS})
 
+katie_setup_target(qdbus)
+katie_setup_target(qdbuscpp2xml)
+katie_setup_target(qdbusxml2cpp)
+
 install(
     TARGETS qdbus qdbuscpp2xml qdbusxml2cpp
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/qdbusviewer/CMakeLists.txt

@@ -43,8 +43,6 @@ configure_file(
     @ONLY
 )
 
-katie_resources(${QDBUSVIEWER_SOURCES} ${QDBUSVIEWER_HEADERS})
-katie_setup_flags()
 katie_setup_paths()
 
 add_executable(qdbusviewer
@@ -53,6 +51,8 @@ add_executable(qdbusviewer
 )
 target_link_libraries(qdbusviewer ${EXTRA_QDBUSVIEWER_LIBS})
 
+katie_setup_target(qdbusviewer)
+
 install(
     TARGETS qdbusviewer
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/qhelpgenerator/CMakeLists.txt

@@ -25,13 +25,17 @@ set(QHELPGENERATOR_HEADERS
     ${SHAREDHELP_HEADERS}
 )
 
-katie_resources(${QHELPGENERATOR_SOURCES} ${QHELPGENERATOR_HEADERS})
-katie_setup_flags()
 katie_setup_paths()
 
-add_executable(qhelpgenerator $<TARGET_OBJECTS:sharedhelp> ${QHELPGENERATOR_SOURCES} ${QHELPGENERATOR_HEADERS})
+add_executable(qhelpgenerator
+    $<TARGET_OBJECTS:sharedhelp>
+    ${QHELPGENERATOR_SOURCES}
+    ${QHELPGENERATOR_HEADERS}
+)
 target_link_libraries(qhelpgenerator ${EXTRA_QHELPGENERATOR_LIBS})
 
+katie_setup_target(qhelpgenerator)
+
 install(
     TARGETS qhelpgenerator
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/qscript/CMakeLists.txt

@@ -21,13 +21,13 @@ set(QSCRIPT_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/bytearrayprototype.h
 )
 
-katie_resources(${QSCRIPT_SOURCES} ${QSCRIPT_HEADERS})
-katie_setup_flags()
 katie_setup_paths()
 
 add_executable(qscript ${QSCRIPT_SOURCES} ${QSCRIPT_HEADERS})
 target_link_libraries(qscript ${EXTRA_QTSCRIPT_LIBS})
 
+katie_setup_target(qscript)
+
 install(
     TARGETS qscript
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/qtconfig/CMakeLists.txt

@@ -37,8 +37,6 @@ configure_file(
     @ONLY
 )
 
-katie_resources(${QTCONFIG_SOURCES} ${QTCONFIG_HEADERS})
-katie_setup_flags()
 katie_setup_paths()
 
 add_executable(qtconfig
@@ -47,6 +45,8 @@ add_executable(qtconfig
 )
 target_link_libraries(qtconfig ${EXTRA_QTCONFIG_LIBS})
 
+katie_setup_target(qtconfig)
+
 install(
     TARGETS qtconfig
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/rcc/CMakeLists.txt

@@ -21,12 +21,13 @@ set(RCC_HEADERS
     ${CMAKE_SOURCE_DIR}/src/core/kernel/qcorecmdlineargs_p.h
 )
 
-katie_setup_flags()
 katie_setup_paths()
 
 add_executable(rcc ${RCC_SOURCES} ${RCC_HEADERS})
 target_link_libraries(rcc ${EXTRA_RCC_LIBS})
 
+katie_setup_target(rcc)
+
 install(
     TARGETS rcc
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/tools/uic/CMakeLists.txt

@@ -27,12 +27,13 @@ set(UIC_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppwriteinitialization.cpp
 )
 
-katie_setup_flags()
 katie_setup_paths()
 
 add_executable(uic ${UIC_SOURCES})
 target_link_libraries(uic ${EXTRA_UIC_LIBS})
 
+katie_setup_target(uic)
+
 install(
     TARGETS uic
     EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/uitools/CMakeLists.txt

@@ -58,8 +58,6 @@ 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()
 
 add_library(KtUiTools ${KATIE_TYPE} ${UITOOLS_SOURCES} ${UITOOLS_HEADERS})
@@ -70,6 +68,8 @@ set_target_properties(KtUiTools PROPERTIES
     EXPORT_NAME UiTools
 )
 
+katie_setup_target(KtUiTools)
+
 install(
     TARGETS KtUiTools
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/winmain/CMakeLists.txt

@@ -12,11 +12,9 @@ set(MAIN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/qtmain_win.cpp
 )
 
-katie_resources(${MAIN_SOURCES})
-katie_setup_flags()
 katie_setup_paths()
 
-add_library(KtMain ${MAIN_SOURCES} ${MAIN_HEADERS})
+add_library(KtMain ${KATIE_TYPE} ${MAIN_SOURCES} ${MAIN_HEADERS})
 target_link_libraries(KtMain ${EXTRA_MAIN_LIBS})
 set_target_properties(KtMain PROPERTIES
     VERSION ${KATIE_MAJOR}.${KATIE_MINOR}
@@ -24,6 +22,8 @@ set_target_properties(KtMain PROPERTIES
     EXPORT_NAME Main
 )
 
+katie_setup_target(KtMain)
+
 install(
     TARGETS KtMain
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/xml/CMakeLists.txt

@@ -75,8 +75,6 @@ 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()
 
 add_library(KtXml ${KATIE_TYPE} ${XML_SOURCES} ${XML_HEADERS})
@@ -87,6 +85,8 @@ set_target_properties(KtXml PROPERTIES
     EXPORT_NAME Xml
 )
 
+katie_setup_target(KtXml)
+
 install(
     TARGETS KtXml
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

src/xmlpatterns/CMakeLists.txt

@@ -75,8 +75,6 @@ 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()
 
 # the component requires exceptions
@@ -92,6 +90,8 @@ set_target_properties(KtXmlPatterns PROPERTIES
     EXPORT_NAME XmlPatterns
 )
 
+katie_setup_target(KtXmlPatterns)
+
 install(
     TARGETS KtXmlPatterns
     EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}

util/fixnonlatin1/CMakeLists.txt

@@ -13,8 +13,7 @@ set(FIXONLATIN1_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
 
-katie_resources(${FIXONLATIN1_SOURCES})
-katie_setup_flags()
-
 add_executable(fixonlatin1 EXCLUDE_FROM_ALL ${FIXONLATIN1_SOURCES})
 target_link_libraries(fixonlatin1 ${EXTRA_FIXONLATIN1_LIBS})
+
+katie_setup_target(fixonlatin1)

util/gencmap/CMakeLists.txt

@@ -15,8 +15,7 @@ set(GENCMAP_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/gencmap.cpp
 )
 
-katie_resources(${GENCMAP_SOURCES})
-katie_setup_flags()
-
 add_executable(gencmap EXCLUDE_FROM_ALL ${GENCMAP_SOURCES})
 target_link_libraries(gencmap ${EXTRA_GENCMAP_LIBS})
+
+katie_setup_target(gencmap)

util/generaterun/CMakeLists.txt

@@ -15,8 +15,7 @@ set(GENERATERUN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/codegenerator.h
 )
 
-katie_resources(${GENERATERUN_SOURCES})
-katie_setup_flags()
-
 add_executable(generaterun EXCLUDE_FROM_ALL ${GENERATERUN_SOURCES})
 target_link_libraries(generaterun ${EXTRA_GENERATERUN_LIBS})
+
+katie_setup_target(generaterun)

util/lexgen/CMakeLists.txt

@@ -25,8 +25,7 @@ set(LEXGEN_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/re2nfa.h
 )
 
-katie_resources(${LEXGEN_SOURCES} ${LEXGEN_HEADERS})
-katie_setup_flags()
-
 add_executable(lexgen EXCLUDE_FROM_ALL ${LEXGEN_SOURCES} ${LEXGEN_HEADERS})
 target_link_libraries(lexgen ${EXTRA_LEXGEN_LIBS})
+
+katie_setup_target(lexgen)

util/normalize/CMakeLists.txt

@@ -13,8 +13,7 @@ set(NORMALIZE_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
 
-katie_resources(${NORMALIZE_SOURCES})
-katie_setup_flags()
-
 add_executable(normalize EXCLUDE_FROM_ALL ${NORMALIZE_SOURCES})
 target_link_libraries(normalize ${EXTRA_NORMALIZE_LIBS})
+
+katie_setup_target(normalize)

util/plugintest/CMakeLists.txt

@@ -13,8 +13,7 @@ set(PLUGINTEST_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
 
-katie_resources(${PLUGINTEST_SOURCES})
-katie_setup_flags()
-
 add_executable(plugintest EXCLUDE_FROM_ALL ${PLUGINTEST_SOURCES})
 target_link_libraries(plugintest ${EXTRA_PLUGINTEST_LIBS})
+
+katie_setup_target(plugintest)

util/qlalr/CMakeLists.txt

@@ -29,8 +29,7 @@ set(QLALR_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/grammar_p.h
 )
 
-katie_resources(${QLALR_SOURCES} ${QLALR_HEADERS})
-katie_setup_flags()
-
 add_executable(qlalr EXCLUDE_FROM_ALL ${QLALR_SOURCES} ${QLALR_HEADERS})
 target_link_libraries(qlalr ${EXTRA_QLALR_LIBS})
+
+katie_setup_target(qlalr)

util/qurl-generateTLDs/CMakeLists.txt

@@ -13,8 +13,7 @@ set(QURLGENERATE_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
 
-katie_resources(${QURLGENERATE_SOURCES})
-katie_setup_flags()
-
 add_executable(qurl-generateTLDs EXCLUDE_FROM_ALL ${QURLGENERATE_SOURCES})
 target_link_libraries(qurl-generateTLDs ${EXTRA_QURLGENERATE_LIBS})
+
+katie_setup_target(qurl-generateTLDs)

util/unicode/CMakeLists.txt

@@ -13,8 +13,7 @@ set(UNICODE_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
 
-katie_resources(${UNICODE_SOURCES})
-katie_setup_flags()
-
 add_executable(unicode EXCLUDE_FROM_ALL ${UNICODE_SOURCES})
 target_link_libraries(unicode ${EXTRA_UNICODE_LIBS})
+
+katie_setup_target(unicode)

util/xkbdatagen/CMakeLists.txt

@@ -15,8 +15,7 @@ set(XKBDATAGEN_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
 )
 
-katie_resources(${XKBDATAGEN_SOURCES})
-katie_setup_flags()
-
 add_executable(xkbdatagen EXCLUDE_FROM_ALL ${XKBDATAGEN_SOURCES})
 target_link_libraries(xkbdatagen ${EXTRA_XKBDATAGEN_LIBS})
+
+katie_setup_target(xkbdatagen)