diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-14 14:46:17 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-14 14:24:43 +0000 |
| commit | 89d4f2f13e9bcd9ae40ad51fe043b2838b46e26e (patch) | |
| tree | a061d712d3c68f273b5515031328381f3a733df3 /src | |
| parent | 3854b5892b1d820e0e7232c781a2bb3603539473 (diff) | |
Remove invalid conversion and make it clearer for the future
Change-Id: I62fc075a4ebec7783a1e5fa35e113951aab9e674
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/bootstrap/CMakeLists.txt | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index 26013c2a3f..7762ef4ae4 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -184,34 +184,34 @@ 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 [...]) +# special case begin +# These lines need to commented out. This will never get cross_compiled! +#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 end qt_extend_target(Bootstrap CONDITION WIN32 AND mingw PUBLIC_LIBRARIES |