CMake: Re-generate bootstrap-related CMakeLists.txt files

Change-Id: Ia4be80729807c6aaac5b22a0dab81a841d57bdcd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

5 files changed, 243 insertions, 154 deletions

diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index d5d8bcd893..4bbbe08ea5 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -1,152 +1,174 @@
+# Generated from bootstrap.pro.
 
-if(WIN32)
-    set(os_sources
+#####################################################################
+## Bootstrap Module:
+#####################################################################
+
+# special case:
+add_library(Bootstrap STATIC)
+extend_target(Bootstrap
+    SOURCES
+        ../../corelib/codecs/qlatincodec.cpp
+        ../../corelib/codecs/qtextcodec.cpp
+        ../../corelib/codecs/qutfcodec.cpp
+        ../../corelib/global/qendian.cpp
+        ../../corelib/global/qglobal.cpp
+        ../../corelib/global/qlogging.cpp
+        ../../corelib/global/qmalloc.cpp
+        ../../corelib/global/qnumeric.cpp
+        ../../corelib/global/qoperatingsystemversion.cpp
+        ../../corelib/global/qrandom.cpp
+        ../../corelib/io/qabstractfileengine.cpp
+        ../../corelib/io/qbuffer.cpp
+        ../../corelib/io/qdebug.cpp
+        ../../corelib/io/qdir.cpp
+        ../../corelib/io/qdiriterator.cpp
+        ../../corelib/io/qfile.cpp
+        ../../corelib/io/qfiledevice.cpp
+        ../../corelib/io/qfileinfo.cpp
+        ../../corelib/io/qfilesystemengine.cpp
+        ../../corelib/io/qfilesystementry.cpp
+        ../../corelib/io/qfsfileengine.cpp
+        ../../corelib/io/qfsfileengine_iterator.cpp
+        ../../corelib/io/qiodevice.cpp
+        ../../corelib/io/qloggingcategory.cpp
+        ../../corelib/io/qloggingregistry.cpp
+        ../../corelib/io/qresource.cpp
+        ../../corelib/io/qsavefile.cpp
+        ../../corelib/io/qstandardpaths.cpp
+        ../../corelib/io/qtemporarydir.cpp
+        ../../corelib/io/qtemporaryfile.cpp
+        ../../corelib/kernel/qcoreapplication.cpp
+        ../../corelib/kernel/qcoreglobaldata.cpp
+        ../../corelib/kernel/qmetatype.cpp
+        ../../corelib/kernel/qsystemerror.cpp
+        ../../corelib/kernel/qvariant.cpp
+        ../../corelib/plugin/quuid.cpp
+        ../../corelib/serialization/qdatastream.cpp
+        ../../corelib/serialization/qjson.cpp
+        ../../corelib/serialization/qjsonarray.cpp
+        ../../corelib/serialization/qjsondocument.cpp
+        ../../corelib/serialization/qjsonobject.cpp
+        ../../corelib/serialization/qjsonparser.cpp
+        ../../corelib/serialization/qjsonvalue.cpp
+        ../../corelib/serialization/qjsonwriter.cpp
+        ../../corelib/serialization/qtextstream.cpp
+        ../../corelib/serialization/qxmlstream.cpp
+        ../../corelib/serialization/qxmlutils.cpp
+        ../../corelib/tools/qarraydata.cpp
+        ../../corelib/tools/qbitarray.cpp
+        ../../corelib/tools/qbytearray.cpp
+        ../../corelib/tools/qbytearraymatcher.cpp
+        ../../corelib/tools/qcommandlineoption.cpp
+        ../../corelib/tools/qcommandlineparser.cpp
+        ../../corelib/tools/qcryptographichash.cpp
+        ../../corelib/tools/qdatetime.cpp
+        ../../corelib/tools/qhash.cpp
+        ../../corelib/tools/qline.cpp
+        ../../corelib/tools/qlinkedlist.cpp
+        ../../corelib/tools/qlist.cpp
+        ../../corelib/tools/qlocale.cpp
+        ../../corelib/tools/qlocale_tools.cpp
+        ../../corelib/tools/qmap.cpp
+        ../../corelib/tools/qpoint.cpp
+        ../../corelib/tools/qrect.cpp
+        ../../corelib/tools/qregexp.cpp
+        ../../corelib/tools/qringbuffer.cpp
+        ../../corelib/tools/qsize.cpp
+        ../../corelib/tools/qstring.cpp
+        ../../corelib/tools/qstring_compat.cpp
+        ../../corelib/tools/qstringbuilder.cpp
+        ../../corelib/tools/qstringlist.cpp
+        ../../corelib/tools/qversionnumber.cpp
+        ../../corelib/tools/qvsnprintf.cpp
+        ../../xml/dom/qdom.cpp
+        ../../xml/sax/qxml.cpp
+    PUBLIC_DEFINES  # special case:
+        QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
+        QT_VERSION_MINOR=${PROJECT_VERSION_MINOR}
+        QT_VERSION_PATCH=${PROJECT_VERSION_PATCH}
+        QT_VERSION_STR="${PROJECT_VERSION}"
+        QT_BOOTSTRAPPED
+        QT_NO_CAST_ASCII
+        QT_NO_FOREACH
+        QT_NO_CAST_FROM_ASCII
+    PUBLIC_INCLUDE_DIRECTORIES  # special case
+        $<TARGET_PROPERTY:CorePrivate,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:XmlPrivate,INTERFACE_INCLUDE_DIRECTORIES>
+    PUBLIC_LIBRARIES  # special case
+        ZLIB::ZLIB
+    # CONFIG = "minimal_syncqt" "internal_module" "force_bootstrap" "gc_binaries"
+    # INSTALLS = "lib"
+    # MODULE_CONFIG = "gc_binaries"
+    # MODULE_DEFINES = "QT_VERSION_STR=$$shell_quote\"$$QT_VERSION\"" "QT_VERSION_MAJOR=$$QT_MAJOR_VERSION" "QT_VERSION_MINOR=$$QT_MINOR_VERSION" "QT_VERSION_PATCH=$$QT_PATCH_VERSION" "QT_BOOTSTRAPPED" "QT_NO_CAST_TO_ASCII"
+    # MODULE_INCNAME = "QtCore" "QtXml"
+    # _LOADED = "qt_module"
+    # _OPTION = "host_build"
+    # lib.CONFIG = "dummy_install"
+)
+
+qt_internal_add_target_aliases(Bootstrap)  # special case
+
+## Scopes:
+#####################################################################
+
+extend_target(Bootstrap CONDITION UNIX
+    SOURCES
+        ../../corelib/io/qfilesystemengine_unix.cpp
+        ../../corelib/io/qfilesystemiterator_unix.cpp
+        ../../corelib/io/qfsfileengine_unix.cpp
+        ../../corelib/kernel/qcore_unix.cpp
+)
+
+extend_target(Bootstrap CONDITION WIN32
+    SOURCES
         ../../corelib/global/qoperatingsystemversion_win.cpp
         ../../corelib/io/qfilesystemengine_win.cpp
         ../../corelib/io/qfilesystemiterator_win.cpp
         ../../corelib/io/qfsfileengine_win.cpp
+        ../../corelib/io/qstandardpaths_win.cpp
         ../../corelib/kernel/qcoreapplication_win.cpp
         ../../corelib/plugin/qsystemlibrary.cpp
-        ../../corelib/io/qstandardpaths_win.cpp
-        )
-    set(os_libs user32 ole32 advapi32 shell32 netapi32)
-else()
-    set(os_sources
-        ../../corelib/kernel/qcore_unix.cpp
-        ../../corelib/io/qfilesystemengine_unix.cpp
-        ../../corelib/io/qfilesystemiterator_unix.cpp
-        ../../corelib/io/qfsfileengine_unix.cpp
-    )
+    LIBRARIES
+        user32
+        ole32
+        advapi32
+        shell32
+        netapi32
+)
 
-    if(APPLE)
-        list(APPEND os_sources
-            ../../corelib/global/qoperatingsystemversion_darwin.mm
-            ../../corelib/io/qstandardpaths_mac.mm
-            ../../corelib/kernel/qcoreapplication_mac.cpp
-            ../../corelib/kernel/qcore_mac.cpp
-            ../../corelib/kernel/qcore_mac_objc.mm
-            ../../corelib/kernel/qcore_foundation.mm
-            ../../corelib/io/qurl.cpp
-        )
-    else()
-        list(APPEND os_sources ../../corelib/io/qstandardpaths_unix.cpp)
-    endif()
-    set(os_libs "")
-endif()
+extend_target(Bootstrap CONDITION APPLE_OSX
+    SOURCES
+        ../../corelib/global/qoperatingsystemversion_darwin.mm
+        ../../corelib/io/qstandardpaths_mac.mm
+        ../../corelib/kernel/qcore_foundation.mm
+        ../../corelib/kernel/qcore_mac.cpp
+        ../../corelib/kernel/qcore_mac_objc.mm
+        ../../corelib/kernel/qcoreapplication_mac.cpp
+    LIBRARIES
+        ${FWCoreServices}
+        ${FWFoundation}
+)
 
-add_library(Bootstrap STATIC
-    ../../corelib/codecs/qlatincodec.cpp
-    ../../corelib/codecs/qtextcodec.cpp
-    ../../corelib/codecs/qutfcodec.cpp
-    ../../corelib/global/qendian.cpp
-    ../../corelib/global/qglobal.cpp
-    ../../corelib/global/qlogging.cpp
-    ../../corelib/global/qmalloc.cpp
-    ../../corelib/global/qnumeric.cpp
-    ../../corelib/global/qoperatingsystemversion.cpp
-    ../../corelib/global/qrandom.cpp
-    ../../corelib/io/qabstractfileengine.cpp
-    ../../corelib/io/qbuffer.cpp
-    ../../corelib/io/qdebug.cpp
-    ../../corelib/io/qdir.cpp
-    ../../corelib/io/qdiriterator.cpp
-    ../../corelib/io/qfile.cpp
-    ../../corelib/io/qfileinfo.cpp
-    ../../corelib/io/qfilesystementry.cpp
-    ../../corelib/io/qfilesystemengine.cpp
-    ../../corelib/io/qfsfileengine.cpp
-    ../../corelib/io/qfsfileengine_iterator.cpp
-    ../../corelib/io/qiodevice.cpp
-    ../../corelib/io/qfiledevice.cpp
-    ../../corelib/io/qresource.cpp
-    ../../corelib/io/qtemporarydir.cpp
-    ../../corelib/io/qtemporaryfile.cpp
-    ../../corelib/io/qsavefile.cpp
-    ../../corelib/io/qstandardpaths.cpp
-    ../../corelib/io/qloggingcategory.cpp
-    ../../corelib/io/qloggingregistry.cpp
-    ../../corelib/kernel/qcoreapplication.cpp
-    ../../corelib/kernel/qcoreglobaldata.cpp
-    ../../corelib/kernel/qmetatype.cpp
-    ../../corelib/kernel/qvariant.cpp
-    ../../corelib/kernel/qsystemerror.cpp
-    ../../corelib/plugin/quuid.cpp
-    ../../corelib/serialization/qdatastream.cpp
-    ../../corelib/serialization/qjson.cpp
-    ../../corelib/serialization/qjsondocument.cpp
-    ../../corelib/serialization/qjsonobject.cpp
-    ../../corelib/serialization/qjsonarray.cpp
-    ../../corelib/serialization/qjsonvalue.cpp
-    ../../corelib/serialization/qjsonparser.cpp
-    ../../corelib/serialization/qjsonwriter.cpp
-    ../../corelib/serialization/qtextstream.cpp
-    ../../corelib/serialization/qxmlutils.cpp
-    ../../corelib/serialization/qxmlstream.cpp
-    ../../corelib/tools/qbitarray.cpp
-    ../../corelib/tools/qbytearray.cpp
-    ../../corelib/tools/qarraydata.cpp
-    ../../corelib/tools/qbytearraymatcher.cpp
-    ../../corelib/tools/qcommandlineparser.cpp
-    ../../corelib/tools/qcommandlineoption.cpp
-    ../../corelib/tools/qcryptographichash.cpp
-    ../../corelib/tools/qdatetime.cpp
-    ../../corelib/tools/qhash.cpp
-    ../../corelib/tools/qlist.cpp
-    ../../corelib/tools/qlinkedlist.cpp
-    ../../corelib/tools/qlocale.cpp
-    ../../corelib/tools/qlocale_tools.cpp
-    ../../corelib/tools/qmap.cpp
-    ../../corelib/tools/qregexp.cpp
-    ../../corelib/tools/qringbuffer.cpp
-    ../../corelib/tools/qpoint.cpp
-    ../../corelib/tools/qrect.cpp
-    ../../corelib/tools/qsize.cpp
-    ../../corelib/tools/qline.cpp
-    ../../corelib/tools/qstring.cpp
-    ../../corelib/tools/qstringbuilder.cpp
-    ../../corelib/tools/qstring_compat.cpp
-    ../../corelib/tools/qstringlist.cpp
-    ../../corelib/tools/qversionnumber.cpp
-    ../../corelib/tools/qvsnprintf.cpp
-    ../../xml/dom/qdom.cpp
-    ../../xml/sax/qxml.cpp
-    ${os_sources}
+extend_target(Bootstrap CONDITION APPLE_OSX AND APPLE_UIKIT
+    LIBRARIES
+        ${FWUIKit}
 )
 
-add_library(Qt::Bootstrap ALIAS Bootstrap)
-qt_internal_add_target_aliases(Bootstrap)
+extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX
+    SOURCES
+        ../../corelib/io/qstandardpaths_unix.cpp
+)
 
-qt_ensure_perl()
-foreach(module QtCore QtXml)
-    execute_process(COMMAND "${HOST_PERL}" -w "${PROJECT_SOURCE_DIR}/bin/syncqt.pl" -quiet -minimal -module "${module}" -version "${PROJECT_VERSION}" -outdir "${PROJECT_BINARY_DIR}" "${PROJECT_SOURCE_DIR}")
-    target_include_directories(Bootstrap PUBLIC
-        "${PROJECT_BINARY_DIR}/include/${module}"
-        "${PROJECT_BINARY_DIR}/include/${module}/${PROJECT_VERSION}"
-        "${PROJECT_BINARY_DIR}/include/${module}/${PROJECT_VERSION}/${module}")
-endforeach()
+# special case: This will never get cross_compiled!
+# extend_target(Bootstrap CONDITION cross_compile [...])
+# extend_target(Bootstrap CONDITION NOT cross_compile [...])
 
-target_compile_definitions(Bootstrap PUBLIC
-    QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
-    QT_VERSION_MINOR=${PROJECT_VERSION_MINOR}
-    QT_VERSION_PATCH=${PROJECT_VERSION_PATCH}
-    QT_VERSION_STR="${PROJECT_VERSION}"
-    QT_BOOTSTRAPPED
-    QT_NO_CAST_ASCII
-    QT_NO_FOREACH
-    QT_NO_CAST_FROM_ASCII
+extend_target(Bootstrap CONDITION WIN32 AND mingw
+    LIBRARIES
+        uuid
 )
-target_link_libraries(Bootstrap PUBLIC Qt::Platform ${os_libs})
-target_include_directories(Bootstrap PUBLIC "${PROJECT_BINARY_DIR}/include")
-target_link_libraries(Bootstrap PRIVATE ZLIB::ZLIB)
-
-### fixme: Expose as some cmake equivalent of a reusable qmake mkspecs/features/gc_binaries.prf.
-if(APPLE)
-    target_link_libraries(Bootstrap INTERFACE "-Wl,-dead_strip")
-endif()
 
-if (APPLE)
-    find_library(FWFoundation Foundation)
-    find_library(FWCoreServices CoreServices)
-    target_link_libraries(Bootstrap INTERFACE ${FWFoundation})
-    target_link_libraries(Bootstrap PRIVATE ${FWCoreServices})
-endif()
+# special case:
+qt_internal_add_link_flags_gc_sections(Bootstrap PUBLIC)
+set_target_properties(Bootstrap PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF)
diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt
index b16ed026a4..470baa7127 100644
--- a/src/tools/moc/CMakeLists.txt
+++ b/src/tools/moc/CMakeLists.txt
@@ -1,10 +1,32 @@
-add_qt_tool(moc BOOTSTRAP
-    LIBRARIES tinycbor
+# Generated from moc.pro.
+
+#####################################################################
+## moc Tool:
+#####################################################################
+
+add_qt_tool(moc
+    BOOTSTRAP
     SOURCES
-        moc.cpp
-        preprocessor.cpp
-        generator.cpp
-        parser.cpp
-        token.cpp
-        main.cpp
+        cbordevice.h
+        generator.cpp generator.h
+        main.cpp  # special case
+        moc.cpp moc.h
+        outputrevision.h
+        parser.cpp parser.h
+        preprocessor.cpp preprocessor.h
+        symbols.h
+        token.cpp token.h
+        utils.h
+    DEFINES
+        QT_MOC
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_NO_COMPRESS
+        QT_NO_FOREACH
+    LIBRARIES
+        tinycbor
+    # CONFIG = "force_bootstrap"
+    # QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler"
+    # _LOADED = "qt_tool"
+    # _OPTION = "host_build"
 )
diff --git a/src/tools/qfloat16-tables/CMakeLists.txt b/src/tools/qfloat16-tables/CMakeLists.txt
index 60d6282976..f437ccc8db 100644
--- a/src/tools/qfloat16-tables/CMakeLists.txt
+++ b/src/tools/qfloat16-tables/CMakeLists.txt
@@ -1,2 +1,16 @@
-add_qt_tool(qfloat16-tables BOOTSTRAP SOURCES gen_qfloat16_tables.cpp)
+# Generated from qfloat16-tables.pro.
 
+#####################################################################
+## qfloat16-tables Tool:
+#####################################################################
+
+add_qt_tool(qfloat16-tables
+    BOOTSTRAP
+    SOURCES
+        gen_qfloat16_tables.cpp
+    # CONFIG = "force_bootstrap"
+    # INSTALLS = "lib"
+    # _LOADED = "qt_tool"
+    # _OPTION = "host_build"
+    # lib.CONFIG = "dummy_install"
+)
diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt
index 4a882e7860..12fd0690a7 100644
--- a/src/tools/rcc/CMakeLists.txt
+++ b/src/tools/rcc/CMakeLists.txt
@@ -1 +1,22 @@
-add_qt_tool(rcc BOOTSTRAP SOURCES rcc.cpp main.cpp)
+# Generated from rcc.pro.
+
+#####################################################################
+## rcc Tool:
+#####################################################################
+
+add_qt_tool(rcc
+    BOOTSTRAP
+    SOURCES
+        main.cpp
+        rcc.cpp rcc.h
+    DEFINES
+        QT_RCC
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    # CONFIG = "force_bootstrap"
+    # QMAKE_TARGET_DESCRIPTION = "Qt Resource Compiler"
+    # _LOADED = "qt_tool"
+    # _OPTION = "host_build"
+)
diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt
index 85ae0ffef7..bfb33d77c5 100644
--- a/src/tools/tracegen/CMakeLists.txt
+++ b/src/tools/tracegen/CMakeLists.txt
@@ -1,10 +1,20 @@
-add_qt_tool(tracegen BOOTSTRAP
+# Generated from tracegen.pro.
+
+#####################################################################
+## tracegen Tool:
+#####################################################################
+
+add_qt_tool(tracegen
+    BOOTSTRAP
     SOURCES
-        etw.cpp
-        helpers.cpp
-        lttng.cpp
-        panic.cpp
-        provider.cpp
-        qtheaders.cpp
+        etw.cpp etw.h
+        helpers.cpp helpers.h
+        lttng.cpp lttng.h
+        panic.cpp panic.h
+        provider.cpp provider.h
+        qtheaders.cpp qtheaders.h
         tracegen.cpp
+    # CONFIG = "force_bootstrap"
+    # _LOADED = "qt_tool"
+    # _OPTION = "host_build"
 )