1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove invalid conversion and make it clearer for the future

Browse Source 
Change-Id: I62fc075a4ebec7783a1e5fa35e113951aab9e674
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2020-01-14 14:46:17 +01:00
parent 3854b5892b
commit 89d4f2f13e
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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