AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Regenerate tools and 3rd party

Browse Source 
Change-Id: I38e065cddc954e8594a5dce823c3bb5385a8a1e8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-05-29 18:03:36 +02:00
parent abe3dbe719
commit a9fbe53966
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/3rdparty/pcre2/CMakeLists.txt vendored
View File

@ -71,3 +71,6 @@ qt_extend_target(BundledPcre2 CONDITION WIN32
PUBLIC_DEFINES
PCRE2_STATIC
)
#### Keys ignored in scope 7:.:.:pcre2.pri:QT_FEATURE_intelcet:
# QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK"

5
src/tools/bootstrap/.prev_CMakeLists.txt
View File

@ -253,7 +253,10 @@ qt_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSC
ZLIB::ZLIB
)
qt_extend_target(Bootstrap CONDITION WIN32 AND mingw
qt_extend_target(Bootstrap CONDITION MINGW AND WIN32
PUBLIC_LIBRARIES
uuid
)
#### Keys ignored in scope 22:.:../../3rdparty/pcre2:../../3rdparty/pcre2/pcre2.pri:QT_FEATURE_intelcet:
# QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK"

5
src/tools/bootstrap/CMakeLists.txt
View File

@ -252,11 +252,14 @@ qt_extend_target(Bootstrap CONDITION QT_FEATURE_system_zlib AND NOT CMAKE_CROSSC
ZLIB::ZLIB
)
qt_extend_target(Bootstrap CONDITION WIN32 AND mingw
qt_extend_target(Bootstrap CONDITION MINGW AND WIN32
PUBLIC_LIBRARIES
uuid
)
#### Keys ignored in scope 22:.:../../3rdparty/pcre2:../../3rdparty/pcre2/pcre2.pri:QT_FEATURE_intelcet:
# QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK"
# special case begin
qt_internal_add_link_flags_gc_sections(Bootstrap PUBLIC)
set_target_properties(Bootstrap PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF)