diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-12-10 12:14:49 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-12-10 20:32:23 +0000 |
| commit | be97330ebc5ff28a021b834f4c097c5d2c381197 (patch) | |
| tree | d5e19d7eff97936bd609fbfe5b9047be98c5c0ab | |
| parent | 73561677d1ace4726160ae4eccf3144b291e8140 (diff) | |
| download | qt3d-be97330ebc5ff28a021b834f4c097c5d2c381197.tar.gz | |
CMake: Don't attempt to build pugixml.cpp
pugixml is configured as header-only library by default. We must not
compile pugixml.cpp.
The qmake project file listed pugixml.cpp as source file, but it was not
compiled, because qmake automatically detected that pugixml.cpp is
included by pugixml.hpp. CMake does not have this automatism.
Fixes: QTBUG-97254
Change-Id: Ibaf434f326d42e2fdea79f359cc625338644ce4d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 89f3dcb444b689090234652741127d6f6c47fdd9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/3rdparty/assimp/assimp.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/assimp/assimp.cmake b/src/3rdparty/assimp/assimp.cmake index d3dbb1572..592246a6f 100644 --- a/src/3rdparty/assimp/assimp.cmake +++ b/src/3rdparty/assimp/assimp.cmake @@ -1,4 +1,3 @@ - # special case begin if(NOT QT_FEATURE_system_zlib) find_package(Qt6 COMPONENTS ZlibPrivate) @@ -119,7 +118,7 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/code/AssetLib/glTF2/glTF2AssetWriter.h ${assimpDir}/src/code/AssetLib/glTF2/glTF2AssetWriter.inl ${assimpDir}/src/code/AssetLib/glTF2/glTF2Importer.cpp ${assimpDir}/src/code/AssetLib/glTF2/glTF2Importer.h ${assimpDir}/src/contrib/pugixml/contrib/foreach.hpp - ${assimpDir}/src/contrib/pugixml/src/pugixml.cpp ${assimpDir}/src/contrib/pugixml/src/pugixml.hpp + ${assimpDir}/src/contrib/pugixml/src/pugixml.hpp ${assimpDir}/src/contrib/poly2tri/poly2tri/common/shapes.cc ${assimpDir}/src/contrib/poly2tri/poly2tri/common/shapes.h ${assimpDir}/src/contrib/poly2tri/poly2tri/common/utils.h ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/advancing_front.cc ${assimpDir}/src/contrib/poly2tri/poly2tri/sweep/advancing_front.h |