summaryrefslogtreecommitdiffstats
path: root/src/tools/bootstrap
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-09-22 10:16:58 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-09-23 16:59:06 +0200
commit403213240c7b2dc09378e1cb8c147131e368f90c (patch)
treeff86910332629fe5e2fab59a30fb863a5febb366 /src/tools/bootstrap
parente0c62a48b8a826a46a143e57e94b2a0ea73c7cae (diff)
CMake: Regenerate projects to use new qt_internal_ API
Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/tools/bootstrap')
-rw-r--r--src/tools/bootstrap/.prev_CMakeLists.txt20
-rw-r--r--src/tools/bootstrap/CMakeLists.txt20
2 files changed, 20 insertions, 20 deletions
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
index b42582efd8..bf93a3958d 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## Bootstrap Module:
#####################################################################
-qt_add_module(Bootstrap
+qt_internal_add_module(Bootstrap
STATIC
INTERNAL_MODULE
NO_SYNC_QT
@@ -164,7 +164,7 @@ qt_add_module(Bootstrap
## Scopes:
#####################################################################
-qt_extend_target(Bootstrap CONDITION UNIX
+qt_internal_extend_target(Bootstrap CONDITION UNIX
SOURCES
../../corelib/io/qfilesystemengine_unix.cpp
../../corelib/io/qfilesystemiterator_unix.cpp
@@ -178,7 +178,7 @@ qt_extend_target(Bootstrap CONDITION UNIX
../../corelib/kernel/qsystemsemaphore_unix.cpp
)
-qt_extend_target(Bootstrap CONDITION WIN32
+qt_internal_extend_target(Bootstrap CONDITION WIN32
SOURCES
../../corelib/global/qoperatingsystemversion_win.cpp
../../corelib/io/qfilesystemengine_win.cpp
@@ -200,7 +200,7 @@ qt_extend_target(Bootstrap CONDITION WIN32
user32
)
-qt_extend_target(Bootstrap CONDITION APPLE
+qt_internal_extend_target(Bootstrap CONDITION APPLE
SOURCES
../../corelib/global/qoperatingsystemversion_darwin.mm
../../corelib/kernel/qcore_foundation.mm
@@ -210,24 +210,24 @@ qt_extend_target(Bootstrap CONDITION APPLE
${FWFoundation}
)
-qt_extend_target(Bootstrap CONDITION MACOS
+qt_internal_extend_target(Bootstrap CONDITION MACOS
SOURCES
../../corelib/io/qstandardpaths_mac.mm
LIBRARIES
${FWCoreServices}
)
-qt_extend_target(Bootstrap CONDITION UIKIT
+qt_internal_extend_target(Bootstrap CONDITION UIKIT
LIBRARIES
${FWUIKit}
)
-qt_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS
+qt_internal_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS
SOURCES
../../corelib/io/qstandardpaths_unix.cpp
)
-qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib
SOURCES
../../3rdparty/zlib/src/adler32.c
../../3rdparty/zlib/src/compress.c
@@ -248,12 +248,12 @@ qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_syst
../../3rdparty/zlib/src
)
-qt_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING
+qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING
LIBRARIES
ZLIB::ZLIB
)
-qt_extend_target(Bootstrap CONDITION MINGW AND WIN32
+qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32
PUBLIC_LIBRARIES
uuid
)
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index fe69c371cb..7669207fdd 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -9,7 +9,7 @@
# libraries.
add_library(Bootstrap STATIC)
# special case end
-qt_extend_target(Bootstrap
+qt_internal_extend_target(Bootstrap
SOURCES
../../3rdparty/pcre2/src/config.h
../../3rdparty/pcre2/src/pcre2.h
@@ -163,7 +163,7 @@ qt_extend_target(Bootstrap
## Scopes:
#####################################################################
-qt_extend_target(Bootstrap CONDITION UNIX
+qt_internal_extend_target(Bootstrap CONDITION UNIX
SOURCES
../../corelib/io/qfilesystemengine_unix.cpp
../../corelib/io/qfilesystemiterator_unix.cpp
@@ -177,7 +177,7 @@ qt_extend_target(Bootstrap CONDITION UNIX
../../corelib/kernel/qsystemsemaphore_unix.cpp
)
-qt_extend_target(Bootstrap CONDITION WIN32
+qt_internal_extend_target(Bootstrap CONDITION WIN32
SOURCES
../../corelib/global/qoperatingsystemversion_win.cpp
../../corelib/io/qfilesystemengine_win.cpp
@@ -199,7 +199,7 @@ qt_extend_target(Bootstrap CONDITION WIN32
user32
)
-qt_extend_target(Bootstrap CONDITION APPLE
+qt_internal_extend_target(Bootstrap CONDITION APPLE
SOURCES
../../corelib/global/qoperatingsystemversion_darwin.mm
../../corelib/kernel/qcore_foundation.mm
@@ -209,24 +209,24 @@ qt_extend_target(Bootstrap CONDITION APPLE
${FWFoundation}
)
-qt_extend_target(Bootstrap CONDITION MACOS
+qt_internal_extend_target(Bootstrap CONDITION MACOS
SOURCES
../../corelib/io/qstandardpaths_mac.mm
LIBRARIES
${FWCoreServices}
)
-qt_extend_target(Bootstrap CONDITION UIKIT
+qt_internal_extend_target(Bootstrap CONDITION UIKIT
LIBRARIES
${FWUIKit}
)
-qt_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS
+qt_internal_extend_target(Bootstrap CONDITION UNIX AND NOT MACOS
SOURCES
../../corelib/io/qstandardpaths_unix.cpp
)
-qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib
SOURCES
../../3rdparty/zlib/src/adler32.c
../../3rdparty/zlib/src/compress.c
@@ -247,12 +247,12 @@ qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_syst
../../3rdparty/zlib/src
)
-qt_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING
+qt_internal_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSCOMPILING
LIBRARIES
ZLIB::ZLIB
)
-qt_extend_target(Bootstrap CONDITION MINGW AND WIN32
+qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32
PUBLIC_LIBRARIES
uuid
)