diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-14 15:57:51 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-22 14:56:03 +0200 |
| commit | e13df32309d920de813b89adcdac659f826b2aef (patch) | |
| tree | 7d9585f39545b4cf6263d8fc79a129acfd9d76c7 /src | |
| parent | b50b65f54f30bfaa0a26b939837674cf3961eba2 (diff) | |
CMake: Adapt to new WrapZLIB package
Pick-to: 6.1
Change-Id: I8d45926ebe6abadaa7f5eaa1f8cf6c34df664b9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/assimp/assimp.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/assimp/assimp.cmake b/src/3rdparty/assimp/assimp.cmake index 66b5e8388..205607367 100644 --- a/src/3rdparty/assimp/assimp.cmake +++ b/src/3rdparty/assimp/assimp.cmake @@ -2,8 +2,8 @@ # special case begin if(NOT QT_FEATURE_system_zlib) find_package(Qt6 COMPONENTS Zlib) -elseif(NOT TARGET ZLIB::ZLIB) - qt_find_package(ZLIB PROVIDED_TARGETS ZLIB::ZLIB) +elseif(NOT TARGET WrapZLIB::WrapZLIB) + qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB) endif() # special case end @@ -297,7 +297,7 @@ function(qt3d_extend_target_for_assimp target) qt_internal_extend_target(${target} CONDITION QT_FEATURE_system_zlib AND NOT QT_FEATURE_qt3d_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) LIBRARIES - ZLIB::ZLIB + WrapZLIB::WrapZLIB ) qt_internal_extend_target(${target} CONDITION (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_qt3d_system_assimp) AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib) AND (host_build OR NOT QT_FEATURE_qt3d_system_assimp) AND (host_build OR NOT QT_FEATURE_system_zlib) |