diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-14 11:19:45 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-14 12:37:25 +0000 |
| commit | 0761715f791a3b8d529521e2c0ac7ba462d55e03 (patch) | |
| tree | 475d2ca15417ce6c0a8c037fe4ab6ca55d1ee2c4 /src/tools | |
| parent | 1f2cdd8a04938ca8fa9df090a85c5d689df4c049 (diff) | |
Regenerate src/
Change-Id: Icef5e834a6acc1cc4488bbed7749e81e1f2388b3
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/tools/bootstrap/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | src/tools/rcc/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/tools/rcc/CMakeLists.txt | 4 |
4 files changed, 31 insertions, 6 deletions
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt index 778006aff1..40d2e85cef 100644 --- a/src/tools/bootstrap/.prev_CMakeLists.txt +++ b/src/tools/bootstrap/.prev_CMakeLists.txt @@ -179,7 +179,7 @@ qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX ../../corelib/io/qstandardpaths_unix.cpp ) -qt_extend_target(Bootstrap CONDITION cross_compile +qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING SOURCES ../../3rdparty/zlib/src/adler32.c ../../3rdparty/zlib/src/compress.c @@ -200,7 +200,7 @@ qt_extend_target(Bootstrap CONDITION cross_compile ../../3rdparty/zlib/src ) -qt_extend_target(Bootstrap CONDITION NOT cross_compile +qt_extend_target(Bootstrap CONDITION NOT CMAKE_CROSSCOMPILING LIBRARIES ZLIB::ZLIB ) diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index 1da097011d..26013c2a3f 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -184,6 +184,31 @@ qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX ../../corelib/io/qstandardpaths_unix.cpp ) +qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING + SOURCES + ../../3rdparty/zlib/src/adler32.c + ../../3rdparty/zlib/src/compress.c + ../../3rdparty/zlib/src/crc32.c + ../../3rdparty/zlib/src/deflate.c + ../../3rdparty/zlib/src/gzclose.c + ../../3rdparty/zlib/src/gzlib.c + ../../3rdparty/zlib/src/gzread.c + ../../3rdparty/zlib/src/gzwrite.c + ../../3rdparty/zlib/src/infback.c + ../../3rdparty/zlib/src/inffast.c + ../../3rdparty/zlib/src/inflate.c + ../../3rdparty/zlib/src/inftrees.c + ../../3rdparty/zlib/src/trees.c + ../../3rdparty/zlib/src/uncompr.c + ../../3rdparty/zlib/src/zutil.c + INCLUDE_DIRECTORIES + ../../3rdparty/zlib/src +) + +qt_extend_target(Bootstrap CONDITION NOT CMAKE_CROSSCOMPILING + LIBRARIES + ZLIB::ZLIB +) # special case: This will never get cross_compiled! # extend_target(Bootstrap CONDITION cross_compile [...]) # extend_target(Bootstrap CONDITION NOT cross_compile [...]) diff --git a/src/tools/rcc/.prev_CMakeLists.txt b/src/tools/rcc/.prev_CMakeLists.txt index f7b790ee5a..307f08bfa7 100644 --- a/src/tools/rcc/.prev_CMakeLists.txt +++ b/src/tools/rcc/.prev_CMakeLists.txt @@ -24,14 +24,14 @@ qt_add_tool(rcc ## Scopes: ##################################################################### -qt_extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile +qt_extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING DEFINES QT_FEATURE_zstd=1 LIBRARIES ZSTD::ZSTD ) -qt_extend_target(rcc CONDITION cross_compile OR NOT QT_FEATURE_zstd +qt_extend_target(rcc CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd DEFINES QT_FEATURE_zstd=-1 ) diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt index 64610dd991..e7f45314c3 100644 --- a/src/tools/rcc/CMakeLists.txt +++ b/src/tools/rcc/CMakeLists.txt @@ -25,14 +25,14 @@ qt_add_tool(rcc ## Scopes: ##################################################################### -qt_extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile +qt_extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT CMAKE_CROSSCOMPILING DEFINES QT_FEATURE_zstd=1 LIBRARIES ZSTD::ZSTD ) -qt_extend_target(rcc CONDITION cross_compile OR NOT QT_FEATURE_zstd +qt_extend_target(rcc CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd DEFINES QT_FEATURE_zstd=-1 ) |