From a9fbe539669d6b22b6d790b02b73e40f1b9ede06 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 29 May 2020 18:03:36 +0200 Subject: CMake: Regenerate tools and 3rd party Change-Id: I38e065cddc954e8594a5dce823c3bb5385a8a1e8 Reviewed-by: Joerg Bornemann --- src/tools/bootstrap/.prev_CMakeLists.txt | 5 ++++- src/tools/bootstrap/CMakeLists.txt | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src/tools') diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt index f81e03adff..55d6b53de8 100644 --- a/src/tools/bootstrap/.prev_CMakeLists.txt +++ b/src/tools/bootstrap/.prev_CMakeLists.txt @@ -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" diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index a5184fbb80..b734f4fc5d 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -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) -- cgit v1.2.3