From 3df33117ffc0a3a1141decaa2c842a700a785092 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 12 Apr 2024 07:40:39 -0700 Subject: [PATCH] [assimp] Update to version 5.4.0 to fix build error (#38126) Fixes #35141 Tested usage successfully by `assimp:x64-windows`: ```` assimp provides CMake targets: # this is heuristically generated, and may not be correct find_package(assimp CONFIG REQUIRED) target_link_libraries(main PRIVATE assimp::assimp) assimp provides pkg-config modules: # Import various well-known 3D model formats in an uniform manner. assimp ```` - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [] Only one version is added to each modified port's versions file. --------- Co-authored-by: Jon --- ports/assimp/build_fixes.patch | 1045 ++++++++++++++++---------------- ports/assimp/portfile.cmake | 4 +- ports/assimp/vcpkg.json | 3 +- versions/a-/assimp.json | 5 + versions/baseline.json | 4 +- 5 files changed, 535 insertions(+), 526 deletions(-) diff --git a/ports/assimp/build_fixes.patch b/ports/assimp/build_fixes.patch index f3bab0ed7c..962cef7626 100644 --- a/ports/assimp/build_fixes.patch +++ b/ports/assimp/build_fixes.patch @@ -1,520 +1,525 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 458a328..b8c2fc6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -291,9 +291,9 @@ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW) - ENDIF() - # supress warning for double to float conversion if Double precission is activated - ADD_COMPILE_OPTIONS(/wd4244) -- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") -- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") -- SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") -+ # SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") -+ # SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") -+ # SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") - ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) - IF(NOT ASSIMP_HUNTER_ENABLED) - SET(CMAKE_POSITION_INDEPENDENT_CODE ON) -@@ -418,7 +418,7 @@ ENDIF() - - set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") - --IF(ASSIMP_HUNTER_ENABLED) -+IF(0) - set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") - set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-hunter-config.cmake.in") - set(NAMESPACE "${PROJECT_NAME}::") -@@ -426,7 +426,7 @@ IF(ASSIMP_HUNTER_ENABLED) - set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") - set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") - ELSE() -- set(CONFIG_INSTALL_DIR "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}") -+ set(CONFIG_INSTALL_DIR "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp") - set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-plain-config.cmake.in") - string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) - set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") -@@ -468,14 +468,14 @@ ENDIF() - - # Search for external dependencies, and build them from source if not found - # Search for zlib --IF(ASSIMP_HUNTER_ENABLED) -- hunter_add_package(ZLIB) -- find_package(ZLIB CONFIG REQUIRED) -+IF(1) -+ # hunter_add_package(ZLIB) -+ find_package(ZLIB REQUIRED) - - add_definitions(-DASSIMP_BUILD_NO_OWN_ZLIB) - set(ZLIB_FOUND TRUE) -- set(ZLIB_LIBRARIES ZLIB::zlib) -- set(ASSIMP_BUILD_MINIZIP TRUE) -+ set(ZLIB_LIBRARIES ZLIB::ZLIB) -+ set(ASSIMP_BUILD_MINIZIP OFF) - ELSE() - # If the zlib is already found outside, add an export in case assimpTargets can't find it. - IF( ZLIB_FOUND ) -@@ -516,12 +516,12 @@ ELSE() - ENDIF() - - IF( NOT IOS ) -- IF( NOT ASSIMP_BUILD_MINIZIP ) -+ IF( 0 ) - use_pkgconfig(UNZIP minizip) - ENDIF() - ELSE () - IF( NOT BUILD_SHARED_LIBS ) -- IF( NOT ASSIMP_BUILD_MINIZIP ) -+ IF( 0 ) - use_pkgconfig(UNZIP minizip) - ENDIF() - ENDIF () -diff --git a/cmake-modules/assimp-plain-config.cmake.in b/cmake-modules/assimp-plain-config.cmake.in -index 6551dcb..0796448 100644 ---- a/cmake-modules/assimp-plain-config.cmake.in -+++ b/cmake-modules/assimp-plain-config.cmake.in -@@ -1,5 +1,20 @@ - @PACKAGE_INIT@ - -+include(CMakeFindDependencyMacro) -+ -+find_dependency(pugixml CONFIG) -+if(NOT @BUILD_SHARED_LIBS@) -+ find_dependency(kubazip CONFIG) -+ find_dependency(unofficial-minizip CONFIG) -+ #find_dependency(openddlparser CONFIG) -+ find_dependency(poly2tri CONFIG) -+ find_dependency(polyclipping CONFIG) -+ find_dependency(RapidJSON CONFIG) -+ find_dependency(Stb MODULE) -+ find_dependency(utf8cpp CONFIG) -+ find_dependency(ZLIB) -+endif() -+ - include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") - - set(ASSIMP_ROOT_DIR ${PACKAGE_PREFIX_DIR}) -diff --git a/code/AssetLib/3MF/D3MFExporter.cpp b/code/AssetLib/3MF/D3MFExporter.cpp -index 42cd991..640e2fb 100644 ---- a/code/AssetLib/3MF/D3MFExporter.cpp -+++ b/code/AssetLib/3MF/D3MFExporter.cpp -@@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - #include - #else --#include -+#include - #endif - - namespace Assimp { -diff --git a/code/AssetLib/Blender/BlenderTessellator.h b/code/AssetLib/Blender/BlenderTessellator.h -index 0d0ba32..c3703c4 100644 ---- a/code/AssetLib/Blender/BlenderTessellator.h -+++ b/code/AssetLib/Blender/BlenderTessellator.h -@@ -143,7 +143,7 @@ namespace Assimp - - #if ASSIMP_BLEND_WITH_POLY_2_TRI - --#include "contrib/poly2tri/poly2tri/poly2tri.h" -+#include - - namespace Assimp - { -diff --git a/code/AssetLib/IFC/IFCGeometry.cpp b/code/AssetLib/IFC/IFCGeometry.cpp -index ef59542..17e00cd 100644 ---- a/code/AssetLib/IFC/IFCGeometry.cpp -+++ b/code/AssetLib/IFC/IFCGeometry.cpp -@@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "IFCUtil.h" - #include "Common/PolyTools.h" - #include "PostProcessing/ProcessHelper.h" --#include "contrib/poly2tri/poly2tri/poly2tri.h" --#include "contrib/clipper/clipper.hpp" -+#include -+#include - - #include - #include -diff --git a/code/AssetLib/IFC/IFCLoader.cpp b/code/AssetLib/IFC/IFCLoader.cpp -index 0c20686..e6b20a3 100644 ---- a/code/AssetLib/IFC/IFCLoader.cpp -+++ b/code/AssetLib/IFC/IFCLoader.cpp -@@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - #include - #else --#include -+#include - #endif - #endif - -diff --git a/code/AssetLib/IFC/IFCOpenings.cpp b/code/AssetLib/IFC/IFCOpenings.cpp -index 3c4a0b3..3fab616 100644 ---- a/code/AssetLib/IFC/IFCOpenings.cpp -+++ b/code/AssetLib/IFC/IFCOpenings.cpp -@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "IFCUtil.h" - #include "Common/PolyTools.h" - #include "PostProcessing/ProcessHelper.h" --#include "contrib/poly2tri/poly2tri/poly2tri.h" --#include "contrib/clipper/clipper.hpp" -+#include -+#include - - #include - #include -diff --git a/code/AssetLib/MMD/MMDPmxParser.cpp b/code/AssetLib/MMD/MMDPmxParser.cpp -index ca37ba1..2ce7bdd 100644 ---- a/code/AssetLib/MMD/MMDPmxParser.cpp -+++ b/code/AssetLib/MMD/MMDPmxParser.cpp -@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include "../contrib/utf8cpp/source/utf8.h" -+# include - #endif - #include - -diff --git a/code/AssetLib/SIB/SIBImporter.cpp b/code/AssetLib/SIB/SIBImporter.cpp -index 7b66afa..5adbe1d 100644 ---- a/code/AssetLib/SIB/SIBImporter.cpp -+++ b/code/AssetLib/SIB/SIBImporter.cpp -@@ -59,7 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - #include - #else --#include "../contrib/utf8cpp/source/utf8.h" -+#include - #endif - #include - #include -diff --git a/code/AssetLib/STEPParser/STEPFileEncoding.cpp b/code/AssetLib/STEPParser/STEPFileEncoding.cpp -index d4456e6..812f29b 100644 ---- a/code/AssetLib/STEPParser/STEPFileEncoding.cpp -+++ b/code/AssetLib/STEPParser/STEPFileEncoding.cpp -@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include -+# include - #endif - - #include -diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt -index 5339454..45e07c0 100644 ---- a/code/CMakeLists.txt -+++ b/code/CMakeLists.txt -@@ -897,8 +897,8 @@ SET( Extra_SRCS - SOURCE_GROUP( Extra FILES ${Extra_SRCS}) - - # pugixml --IF(ASSIMP_HUNTER_ENABLED) -- hunter_add_package(pugixml) -+IF(1) -+ #hunter_add_package(pugixml) - find_package(pugixml CONFIG REQUIRED) - ELSE() - SET( Pugixml_SRCS -@@ -919,30 +919,30 @@ ELSE() - ENDIF() - - # utf8 --IF(ASSIMP_HUNTER_ENABLED) -- hunter_add_package(utf8) -+IF(1) -+ #hunter_add_package(utf8) - find_package(utf8cpp CONFIG REQUIRED) - ELSE() - # utf8 is header-only, so Assimp doesn't need to do anything. - ENDIF() - - # polyclipping --#IF(ASSIMP_HUNTER_ENABLED) -+IF(1) - # hunter_add_package(polyclipping) --# find_package(polyclipping CONFIG REQUIRED) --#ELSE() -+ find_package(polyclipping CONFIG REQUIRED) -+ELSE() - SET( Clipper_SRCS - ../contrib/clipper/clipper.hpp - ../contrib/clipper/clipper.cpp - ) - SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS}) --#ENDIF() -+ENDIF() - - # poly2tri --#IF(ASSIMP_HUNTER_ENABLED) -+IF(1) - # hunter_add_package(poly2tri) --# find_package(poly2tri CONFIG REQUIRED) --#ELSE() -+ find_package(poly2tri CONFIG REQUIRED) -+ELSE() - SET( Poly2Tri_SRCS - ../contrib/poly2tri/poly2tri/common/shapes.cc - ../contrib/poly2tri/poly2tri/common/shapes.h -@@ -957,11 +957,11 @@ ELSE() - ../contrib/poly2tri/poly2tri/sweep/sweep_context.h - ) - SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS}) --#ENDIF() -+ENDIF() - - # minizip/unzip --IF(ASSIMP_HUNTER_ENABLED) -- hunter_add_package(minizip) -+IF(1) -+ #hunter_add_package(minizip) -- find_package(minizip CONFIG REQUIRED) -+ find_package(unofficial-minizip CONFIG REQUIRED) - ELSE() - SET( unzip_SRCS -@@ -969,9 +969,9 @@ ENDIF() - # zip (https://github.com/kuba--/zip) - separate_arguments(ASSIMP_EXPORTERS_LIST UNIX_COMMAND ${ASSIMP_EXPORTERS_ENABLED}) - IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST) -- IF(ASSIMP_HUNTER_ENABLED) -- hunter_add_package(zip) -- find_package(zip CONFIG REQUIRED) -+ IF(1) -+ #hunter_add_package(zip) -+ find_package(kubazip CONFIG REQUIRED) - ELSE() - SET( ziplib_SRCS - ../contrib/zip/src/miniz.h -@@ -991,7 +991,7 @@ IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST) - ENDIF() - - # openddlparser --IF(ASSIMP_HUNTER_ENABLED) -+IF(0) - hunter_add_package(openddlparser) - find_package(openddlparser CONFIG REQUIRED) - ELSE() -@@ -1014,7 +1014,7 @@ ELSE() - ENDIF() - - # Open3DGC --IF(ASSIMP_HUNTER_ENABLED) -+IF(0) - # Nothing to do, not available in Hunter yet. - ELSE() - SET ( open3dgc_SRCS -@@ -1049,6 +1049,7 @@ ELSE() - ../contrib/Open3DGC/o3dgcVector.inl - ) - SOURCE_GROUP( Contrib\\open3dgc FILES ${open3dgc_SRCS}) -+ INCLUDE_DIRECTORIES("../contrib") - ENDIF() - - # Check dependencies for glTF importer with Open3DGC-compression. -@@ -1057,7 +1058,7 @@ ENDIF() - IF (NOT WIN32) - FIND_PACKAGE(RT QUIET) - ENDIF () --IF (NOT ASSIMP_HUNTER_ENABLED AND (RT_FOUND OR WIN32)) -+IF (1) - SET( ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC 1 ) - ADD_DEFINITIONS( -DASSIMP_IMPORTER_GLTF_USE_OPEN3DGC=1 ) - ELSE () -@@ -1067,9 +1068,10 @@ ELSE () - ENDIF () - - # RapidJSON --IF(ASSIMP_HUNTER_ENABLED) -- hunter_add_package(RapidJSON) -+IF(1) -+ #hunter_add_package(RapidJSON) - find_package(RapidJSON CONFIG REQUIRED) -+ ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1) - ELSE() - INCLUDE_DIRECTORIES("../contrib/rapidjson/include") - ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1) -@@ -1080,9 +1082,9 @@ ELSE() - ENDIF() - - # stb --IF(ASSIMP_HUNTER_ENABLED) -- hunter_add_package(stb) -- find_package(stb CONFIG REQUIRED) -+IF(1) -+ #hunter_add_package(stb) -+ find_package(Stb REQUIRED) - ELSE() - SET( stb_SRCS - ../contrib/stb/stb_image.h -@@ -1106,7 +1108,7 @@ IF( MSVC OR "${CMAKE_CXX_SIMULATE_ID}" MATCHES "MSVC") # clang with MSVC ABI - ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) - endif () - --IF(NOT ASSIMP_HUNTER_ENABLED) -+IF(0) - if (UNZIP_FOUND) - SET (unzip_compile_SRCS "") - else () -@@ -1157,7 +1159,7 @@ SET( assimp_src - ) - ADD_DEFINITIONS( -DOPENDDLPARSER_BUILD ) - --IF(NOT ASSIMP_HUNTER_ENABLED) -+IF(1) - INCLUDE_DIRECTORIES( - ${IRRXML_INCLUDE_DIR} - ../contrib/openddlparser/include -@@ -1195,45 +1197,48 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC - $ - $ - $ -+ PRIVATE -+ ${Stb_INCLUDE_DIR} - ) - --IF(ASSIMP_HUNTER_ENABLED) -+IF(1) - TARGET_LINK_LIBRARIES(assimp -- PUBLIC -- #polyclipping::polyclipping -- openddlparser::openddl_parser -+ PRIVATE -+ polyclipping::polyclipping -+ #openddlparser::openddl_parser -+ ${OPENDDL_PARSER_LIBRARIES} -- #poly2tri::poly2tri -+ poly2tri::poly2tri -- minizip::minizip -+ unofficial::minizip::minizip -- ZLIB::zlib -- RapidJSON::rapidjson -+ ZLIB::ZLIB -+ rapidjson -- utf8cpp -+ utf8cpp::utf8cpp -+ PUBLIC - pugixml -- stb::stb - ) -- if(TARGET zip::zip) -- target_link_libraries(assimp PUBLIC zip::zip) -+ if(1) -+ target_link_libraries(assimp PRIVATE kubazip::kubazip) - endif() - - if (ASSIMP_BUILD_DRACO) -- target_link_libraries(assimp PUBLIC ${draco_LIBRARIES}) -+ target_link_libraries(assimp PRIVATE ${draco_LIBRARIES}) - endif() - ELSE() -- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES}) -+ TARGET_LINK_LIBRARIES(assimp PRIVATE ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES}) - if (ASSIMP_BUILD_DRACO) -- target_link_libraries(assimp ${draco_LIBRARIES}) -+ target_link_libraries(assimp PRIVATE ${draco_LIBRARIES}) - endif() - ENDIF() - - if(ASSIMP_ANDROID_JNIIOSYSTEM) - set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI) - add_subdirectory(../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/ ../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/) -- target_link_libraries(assimp android_jniiosystem) -+ target_link_libraries(assimp PRIVATE android_jniiosystem) - endif() - - IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) -- TARGET_LINK_LIBRARIES(assimp optimized ${C4D_RELEASE_LIBRARIES}) -- TARGET_LINK_LIBRARIES(assimp debug ${C4D_DEBUG_LIBRARIES}) -- TARGET_LINK_LIBRARIES(assimp ${C4D_EXTRA_LIBRARIES}) -+ TARGET_LINK_LIBRARIES(assimp PRIVATE optimized ${C4D_RELEASE_LIBRARIES}) -+ TARGET_LINK_LIBRARIES(assimp PRIVATE debug ${C4D_DEBUG_LIBRARIES}) -+ TARGET_LINK_LIBRARIES(assimp PRIVATE ${C4D_EXTRA_LIBRARIES}) - ENDIF () - - if( MSVC ) -@@ -1274,13 +1279,13 @@ if (MINGW) - ARCHIVE_OUTPUT_NAME assimp - ) - if (NOT BUILD_SHARED_LIBS) -- TARGET_LINK_LIBRARIES ( assimp -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lwinpthread ) # winpthread is for libminizip. -+ TARGET_LINK_LIBRARIES ( assimp PRIVATE -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lwinpthread ) # winpthread is for libminizip. - endif () - endif() - - if (${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore") - target_compile_definitions(assimp PUBLIC WindowsStore) -- TARGET_LINK_LIBRARIES(assimp advapi32) -+ TARGET_LINK_LIBRARIES(assimp PRIVATE advapi32) - endif() - - SET_TARGET_PROPERTIES( assimp PROPERTIES -@@ -1310,10 +1315,10 @@ ENDIF() - - # Build against external unzip, or add ../contrib/unzip so - # assimp can #include "unzip.h" --IF(NOT ASSIMP_HUNTER_ENABLED) -+IF(0) - if (UNZIP_FOUND) - INCLUDE_DIRECTORIES(${UNZIP_INCLUDE_DIRS}) -- TARGET_LINK_LIBRARIES(assimp ${UNZIP_LIBRARIES}) -+ TARGET_LINK_LIBRARIES(assimp PRIVATE ${UNZIP_LIBRARIES}) - else () - INCLUDE_DIRECTORIES("../") - endif () -@@ -1321,7 +1326,7 @@ ENDIF() - - # Add RT-extension library for glTF importer with Open3DGC-compression. - IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) -- TARGET_LINK_LIBRARIES(assimp rt) -+ TARGET_LINK_LIBRARIES(assimp PRIVATE rt) - ENDIF () - - -diff --git a/code/Common/StbCommon.h b/code/Common/StbCommon.h -index 1265d25..18f4564 100644 ---- a/code/Common/StbCommon.h -+++ b/code/Common/StbCommon.h -@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #pragma clang diagnostic ignored "-Wunused-function" - #endif - --#ifndef STB_USE_HUNTER -+#if 0 - /* Use prefixed names for the symbols from stb_image as it is a very commonly embedded library. - Including vanilla stb_image symbols causes duplicate symbol problems if assimp is linked - statically together with another library or executable that also embeds stb_image. -@@ -111,7 +111,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #define stbi_zlib_decode_noheader_malloc assimp_stbi_zlib_decode_noheader_malloc - #endif - --#include "stb/stb_image.h" -+#include - - #if _MSC_VER - #pragma warning(pop) -diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp -index 383300e..03fdd9a 100644 ---- a/code/Common/BaseImporter.cpp -+++ b/code/Common/BaseImporter.cpp -@@ -332,7 +332,7 @@ std::string BaseImporter::GetExtension(const std::string &file) { - #ifdef ASSIMP_USE_HUNTER - #include - #else --#include "../contrib/utf8cpp/source/utf8.h" -+#include - #endif - - // ------------------------------------------------------------------------------------------------ -diff --git a/code/Common/ZipArchiveIOSystem.cpp b/code/Common/ZipArchiveIOSystem.cpp -index 3d5c72e..770cb9d 100644 ---- a/code/Common/ZipArchiveIOSystem.cpp -+++ b/code/Common/ZipArchiveIOSystem.cpp -@@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include -+# include - #endif - - namespace Assimp { +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 31c5e66..250d499 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -291,9 +291,9 @@ ELSEIF(MSVC) + ENDIF() + # supress warning for double to float conversion if Double precision is activated + ADD_COMPILE_OPTIONS(/wd4244) +- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") +- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") +- SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") ++ #SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") ++ #SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") ++ #SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") + ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) + IF(NOT ASSIMP_HUNTER_ENABLED) + SET(CMAKE_POSITION_INDEPENDENT_CODE ON) +@@ -421,7 +421,7 @@ ENDIF() + + set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") + +-IF(ASSIMP_HUNTER_ENABLED) ++IF(0) + set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") + set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-hunter-config.cmake.in") + set(NAMESPACE "${PROJECT_NAME}::") +@@ -429,7 +429,7 @@ IF(ASSIMP_HUNTER_ENABLED) + set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") + set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") + ELSE() +- set(CONFIG_INSTALL_DIR "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}") ++ set(CONFIG_INSTALL_DIR "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp") + set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-plain-config.cmake.in") + string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) + set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") +@@ -471,14 +471,14 @@ ENDIF() + + # Search for external dependencies, and build them from source if not found + # Search for zlib +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(ZLIB) +- find_package(ZLIB CONFIG REQUIRED) ++IF(1) ++ # hunter_add_package(ZLIB) ++ find_package(ZLIB REQUIRED) + + add_definitions(-DASSIMP_BUILD_NO_OWN_ZLIB) + set(ZLIB_FOUND TRUE) +- set(ZLIB_LIBRARIES ZLIB::zlib) +- set(ASSIMP_BUILD_MINIZIP TRUE) ++ set(ZLIB_LIBRARIES ZLIB::ZLIB) ++ set(ASSIMP_BUILD_MINIZIP OFF) + ELSE() + # If the zlib is already found outside, add an export in case assimpTargets can't find it. + IF( ZLIB_FOUND ) +@@ -523,12 +523,12 @@ ELSE() + ENDIF() + + IF( NOT IOS ) +- IF( NOT ASSIMP_BUILD_MINIZIP ) ++ IF( 0 ) + use_pkgconfig(UNZIP minizip) + ENDIF() + ELSE () + IF( NOT BUILD_SHARED_LIBS ) +- IF( NOT ASSIMP_BUILD_MINIZIP ) ++ IF( 0 ) + use_pkgconfig(UNZIP minizip) + ENDIF() + ENDIF () +diff --git a/cmake-modules/assimp-plain-config.cmake.in b/cmake-modules/assimp-plain-config.cmake.in +index 6551dcb..457fcd7 100644 +--- a/cmake-modules/assimp-plain-config.cmake.in ++++ b/cmake-modules/assimp-plain-config.cmake.in +@@ -1,5 +1,20 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++ ++find_dependency(pugixml CONFIG) ++if(NOT @BUILD_SHARED_LIBS@) ++ find_dependency(kubazip CONFIG) ++ find_dependency(unofficial-minizip CONFIG) ++ #find_dependency(openddlparser CONFIG) ++ find_dependency(poly2tri CONFIG) ++ find_dependency(polyclipping CONFIG) ++ find_dependency(RapidJSON CONFIG) ++ find_dependency(Stb MODULE) ++ find_dependency(utf8cpp CONFIG) ++ find_dependency(ZLIB) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") + + set(ASSIMP_ROOT_DIR ${PACKAGE_PREFIX_DIR}) +diff --git a/code/AssetLib/3MF/D3MFExporter.cpp b/code/AssetLib/3MF/D3MFExporter.cpp +index 6caa4c8..c130fcc 100644 +--- a/code/AssetLib/3MF/D3MFExporter.cpp ++++ b/code/AssetLib/3MF/D3MFExporter.cpp +@@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + #include + #else +-#include ++#include + #endif + + namespace Assimp { +diff --git a/code/AssetLib/Blender/BlenderTessellator.h b/code/AssetLib/Blender/BlenderTessellator.h +index e43535f..a0104c1 100644 +--- a/code/AssetLib/Blender/BlenderTessellator.h ++++ b/code/AssetLib/Blender/BlenderTessellator.h +@@ -143,7 +143,7 @@ namespace Assimp + + #if ASSIMP_BLEND_WITH_POLY_2_TRI + +-#include "contrib/poly2tri/poly2tri/poly2tri.h" ++#include + + namespace Assimp + { +diff --git a/code/AssetLib/IFC/IFCGeometry.cpp b/code/AssetLib/IFC/IFCGeometry.cpp +index d488b23..1a6c0c7 100644 +--- a/code/AssetLib/IFC/IFCGeometry.cpp ++++ b/code/AssetLib/IFC/IFCGeometry.cpp +@@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include "IFCUtil.h" + #include "Common/PolyTools.h" + #include "PostProcessing/ProcessHelper.h" +-#include "contrib/poly2tri/poly2tri/poly2tri.h" +-#include "contrib/clipper/clipper.hpp" ++#include ++#include + + #include + #include +diff --git a/code/AssetLib/IFC/IFCLoader.cpp b/code/AssetLib/IFC/IFCLoader.cpp +index 9414697..48ad145 100644 +--- a/code/AssetLib/IFC/IFCLoader.cpp ++++ b/code/AssetLib/IFC/IFCLoader.cpp +@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + #include + #else +-#include ++#include + #endif + #endif + +diff --git a/code/AssetLib/IFC/IFCOpenings.cpp b/code/AssetLib/IFC/IFCOpenings.cpp +index 1d37dd8..eadbc86 100644 +--- a/code/AssetLib/IFC/IFCOpenings.cpp ++++ b/code/AssetLib/IFC/IFCOpenings.cpp +@@ -47,8 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include "IFCUtil.h" + #include "Common/PolyTools.h" + #include "PostProcessing/ProcessHelper.h" +-#include "contrib/poly2tri/poly2tri/poly2tri.h" +-#include "contrib/clipper/clipper.hpp" ++#include ++#include + + #include + #include +diff --git a/code/AssetLib/MMD/MMDPmxParser.cpp b/code/AssetLib/MMD/MMDPmxParser.cpp +index 5a3e61d..e444dc8 100644 +--- a/code/AssetLib/MMD/MMDPmxParser.cpp ++++ b/code/AssetLib/MMD/MMDPmxParser.cpp +@@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include "MMDPmxParser.h" + #include +-#include "utf8.h" ++#include + #include + + namespace pmx +diff --git a/code/AssetLib/SIB/SIBImporter.cpp b/code/AssetLib/SIB/SIBImporter.cpp +index e55e675..fb1a12b 100644 +--- a/code/AssetLib/SIB/SIBImporter.cpp ++++ b/code/AssetLib/SIB/SIBImporter.cpp +@@ -56,7 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include +-#include "utf8.h" ++#include + #include + #include + #include +diff --git a/code/AssetLib/STEPParser/STEPFileEncoding.cpp b/code/AssetLib/STEPParser/STEPFileEncoding.cpp +index d7f512c..94275f1 100644 +--- a/code/AssetLib/STEPParser/STEPFileEncoding.cpp ++++ b/code/AssetLib/STEPParser/STEPFileEncoding.cpp +@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + #include "STEPFileEncoding.h" + #include +-#include "utf8.h" ++#include + + #include + +diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt +index 0a7be62..88550e3 100644 +--- a/code/CMakeLists.txt ++++ b/code/CMakeLists.txt +@@ -906,8 +906,8 @@ SET( Extra_SRCS + SOURCE_GROUP( Extra FILES ${Extra_SRCS}) + + # pugixml +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(pugixml) ++IF(1) ++ #hunter_add_package(pugixml) + find_package(pugixml CONFIG REQUIRED) + ELSE() + SET( Pugixml_SRCS +@@ -919,30 +919,30 @@ ELSE() + ENDIF() + + # utf8 +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(utf8) ++IF(1) ++ #hunter_add_package(utf8) + find_package(utf8cpp CONFIG REQUIRED) + ELSE() + INCLUDE_DIRECTORIES("../contrib/utf8cpp/source") + ENDIF() + + # polyclipping +-#IF(ASSIMP_HUNTER_ENABLED) ++IF(1) + # hunter_add_package(polyclipping) +-# find_package(polyclipping CONFIG REQUIRED) +-#ELSE() ++ find_package(polyclipping CONFIG REQUIRED) ++ELSE() + SET( Clipper_SRCS + ../contrib/clipper/clipper.hpp + ../contrib/clipper/clipper.cpp + ) + SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS}) +-#ENDIF() ++ENDIF() + + # poly2tri +-#IF(ASSIMP_HUNTER_ENABLED) ++IF(1) + # hunter_add_package(poly2tri) +-# find_package(poly2tri CONFIG REQUIRED) +-#ELSE() ++ find_package(poly2tri CONFIG REQUIRED) ++ELSE() + SET( Poly2Tri_SRCS + ../contrib/poly2tri/poly2tri/common/shapes.cc + ../contrib/poly2tri/poly2tri/common/shapes.h +@@ -957,12 +957,12 @@ ENDIF() + ../contrib/poly2tri/poly2tri/sweep/sweep_context.h + ) + SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS}) +-#ENDIF() ++ENDIF() + + # minizip/unzip +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(minizip) +- find_package(minizip CONFIG REQUIRED) ++IF(1) ++ #hunter_add_package(minizip) ++ find_package(unofficial-minizip CONFIG REQUIRED) + ELSE() + SET( unzip_SRCS + ../contrib/unzip/crypt.h +@@ -977,9 +977,9 @@ ENDIF() + # zip (https://github.com/kuba--/zip) + separate_arguments(ASSIMP_EXPORTERS_LIST UNIX_COMMAND ${ASSIMP_EXPORTERS_ENABLED}) + IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST) +- IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(zip) +- find_package(zip CONFIG REQUIRED) ++ IF(1) ++ #hunter_add_package(zip) ++ find_package(kubazip CONFIG REQUIRED) + ELSE() + SET( ziplib_SRCS + ../contrib/zip/src/miniz.h +@@ -999,7 +999,7 @@ IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST) + ENDIF() + + # openddlparser +-IF(ASSIMP_HUNTER_ENABLED) ++IF(0) + hunter_add_package(openddlparser) + find_package(openddlparser CONFIG REQUIRED) + ELSE() +@@ -1022,7 +1022,7 @@ ELSE() + ENDIF() + + # Open3DGC +-IF(ASSIMP_HUNTER_ENABLED) ++IF(0) + # Nothing to do, not available in Hunter yet. + ELSE() + SET ( open3dgc_SRCS +@@ -1057,6 +1057,7 @@ ELSE() + ../contrib/Open3DGC/o3dgcVector.inl + ) + SOURCE_GROUP( Contrib\\open3dgc FILES ${open3dgc_SRCS}) ++ INCLUDE_DIRECTORIES("../contrib") + ENDIF() + + # Check dependencies for glTF importer with Open3DGC-compression. +@@ -1065,7 +1066,7 @@ ENDIF() + IF (NOT WIN32) + FIND_PACKAGE(RT QUIET) + ENDIF () +-IF (NOT ASSIMP_HUNTER_ENABLED AND (RT_FOUND OR WIN32)) ++IF (1) + SET( ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC 1 ) + ADD_DEFINITIONS( -DASSIMP_IMPORTER_GLTF_USE_OPEN3DGC=1 ) + ELSE () +@@ -1075,9 +1076,10 @@ ELSE () + ENDIF () + + # RapidJSON +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(RapidJSON) ++IF(1) ++ #hunter_add_package(RapidJSON) + find_package(RapidJSON CONFIG REQUIRED) ++ ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1) + ELSE() + INCLUDE_DIRECTORIES("../contrib/rapidjson/include") + ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1) +@@ -1088,9 +1090,9 @@ ELSE() + ENDIF() + + # stb +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(stb) +- find_package(stb CONFIG REQUIRED) ++IF(1) ++ #hunter_add_package(stb) ++ find_package(Stb REQUIRED) + ELSE() + SET( stb_SRCS + ../contrib/stb/stb_image.h +@@ -1112,7 +1114,7 @@ IF( MSVC OR "${CMAKE_CXX_SIMULATE_ID}" MATCHES "MSVC") # clang with MSVC ABI + ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) + endif () + +-IF(NOT ASSIMP_HUNTER_ENABLED) ++IF(0) + if (UNZIP_FOUND) + SET (unzip_compile_SRCS "") + else () +@@ -1164,7 +1166,7 @@ SET( assimp_src + ) + ADD_DEFINITIONS( -DOPENDDLPARSER_BUILD ) + +-IF(NOT ASSIMP_HUNTER_ENABLED) ++IF(1) + INCLUDE_DIRECTORIES( + ${IRRXML_INCLUDE_DIR} + ../contrib/openddlparser/include +@@ -1266,45 +1268,48 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC + $ + $ + $ ++ PRIVATE ++ ${Stb_INCLUDE_DIR} + ) + +-IF(ASSIMP_HUNTER_ENABLED) ++IF(1) + TARGET_LINK_LIBRARIES(assimp ++ PRIVATE ++ polyclipping::polyclipping ++ #openddlparser::openddl_parser ++ ${OPENDDL_PARSER_LIBRARIES} ++ poly2tri::poly2tri ++ unofficial::minizip::minizip ++ ZLIB::ZLIB ++ rapidjson ++ utf8cpp::utf8cpp + PUBLIC +- #polyclipping::polyclipping +- openddlparser::openddl_parser +- #poly2tri::poly2tri +- minizip::minizip +- ZLIB::zlib +- RapidJSON::rapidjson +- utf8cpp + pugixml +- stb::stb + ) +- if(TARGET zip::zip) +- target_link_libraries(assimp PUBLIC zip::zip) ++ if(1) ++ target_link_libraries(assimp PRIVATE kubazip::kubazip) + endif() + + if (ASSIMP_BUILD_DRACO) +- target_link_libraries(assimp PUBLIC ${draco_LIBRARIES}) ++ target_link_libraries(assimp PRIVATE ${draco_LIBRARIES}) + endif() + ELSE() +- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES}) + if (ASSIMP_BUILD_DRACO) +- target_link_libraries(assimp ${draco_LIBRARIES}) ++ target_link_libraries(assimp PRIVATE ${draco_LIBRARIES}) + endif() + ENDIF() + + if(ASSIMP_ANDROID_JNIIOSYSTEM) + set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI) + add_subdirectory(../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/ ../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/) +- target_link_libraries(assimp android_jniiosystem) ++ target_link_libraries(assimp PRIVATE android_jniiosystem) + endif() + + IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) +- TARGET_LINK_LIBRARIES(assimp optimized ${C4D_RELEASE_LIBRARIES}) +- TARGET_LINK_LIBRARIES(assimp debug ${C4D_DEBUG_LIBRARIES}) +- TARGET_LINK_LIBRARIES(assimp ${C4D_EXTRA_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE optimized ${C4D_RELEASE_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE debug ${C4D_DEBUG_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${C4D_EXTRA_LIBRARIES}) + ENDIF () + + if( MSVC ) +@@ -1345,13 +1350,13 @@ if (MINGW) + ARCHIVE_OUTPUT_NAME assimp + ) + if (NOT BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES ( assimp -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lwinpthread ) # winpthread is for libminizip. ++ TARGET_LINK_LIBRARIES ( assimp PRIVATE -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lwinpthread ) # winpthread is for libminizip. + endif () + endif() + + if (${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore") + target_compile_definitions(assimp PUBLIC WindowsStore) +- TARGET_LINK_LIBRARIES(assimp advapi32) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE advapi32) + endif() + + SET_TARGET_PROPERTIES( assimp PROPERTIES +@@ -1381,14 +1386,14 @@ ENDIF() + + # Build against external unzip, or add ../contrib/unzip so + # assimp can #include "unzip.h" +-IF(NOT ASSIMP_HUNTER_ENABLED) ++IF(0) + if (UNZIP_FOUND) + INCLUDE_DIRECTORIES(${UNZIP_INCLUDE_DIRS}) + # TODO if cmake required version has been updated to >3.12.0, collapse this to the second case only + if(${CMAKE_VERSION} VERSION_LESS "3.12.0") +- TARGET_LINK_LIBRARIES(assimp ${UNZIP_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${UNZIP_LIBRARIES}) + else() +- TARGET_LINK_LIBRARIES(assimp ${UNZIP_LINK_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${UNZIP_LINK_LIBRARIES}) + endif() + else () + INCLUDE_DIRECTORIES("../") +@@ -1397,7 +1402,7 @@ ENDIF() + + # Add RT-extension library for glTF importer with Open3DGC-compression. + IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) +- TARGET_LINK_LIBRARIES(assimp rt) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE rt) + ENDIF () + + +diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp +index 3a4c7c3..f247927 100644 +--- a/code/Common/BaseImporter.cpp ++++ b/code/Common/BaseImporter.cpp +@@ -353,7 +353,7 @@ std::string BaseImporter::GetExtension(const std::string &pFile) { + return false; + } + +-#include "utf8.h" ++#include + + // ------------------------------------------------------------------------------------------------ + // Convert to UTF8 data +diff --git a/code/Common/StbCommon.h b/code/Common/StbCommon.h +index aef23ce..3977fde 100644 +--- a/code/Common/StbCommon.h ++++ b/code/Common/StbCommon.h +@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #pragma clang diagnostic ignored "-Wunused-function" + #endif + +-#ifndef STB_USE_HUNTER ++#if 0 + /* Use prefixed names for the symbols from stb_image as it is a very commonly embedded library. + Including vanilla stb_image symbols causes duplicate symbol problems if assimp is linked + statically together with another library or executable that also embeds stb_image. +@@ -113,7 +113,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #define stbi_zlib_decode_noheader_malloc assimp_stbi_zlib_decode_noheader_malloc + #endif + +-#include "stb/stb_image.h" ++#include + + #if _MSC_VER + #pragma warning(pop) +diff --git a/code/Common/ZipArchiveIOSystem.cpp b/code/Common/ZipArchiveIOSystem.cpp +index 23d7db1..8f9b9ef 100644 +--- a/code/Common/ZipArchiveIOSystem.cpp ++++ b/code/Common/ZipArchiveIOSystem.cpp +@@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include ++# include + #endif + + namespace Assimp { diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index 6b0867ecd4..7cf56c25d6 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO assimp/assimp - REF v${VERSION} - SHA512 49963f84ed0a8145f3af249890a533f0b12f5553ae09581289cb1f20cb49cb1a3ed3f3c4c966ceb43aa897b90deca268aa6554066b2bd34f2ac9c15041420ddb + REF "v${VERSION}" + SHA512 6b0e410160c9f60923283be5d948e60b3b8c7819a7e75c9e39608d72202c1c715c048bd615e33d14544394c63efa6ad01cd3eda4c997ebe5a8c6e15ae18d4715 HEAD_REF master PATCHES build_fixes.patch diff --git a/ports/assimp/vcpkg.json b/ports/assimp/vcpkg.json index 4c8e99cb2f..c115634e4e 100644 --- a/ports/assimp/vcpkg.json +++ b/ports/assimp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "assimp", - "version": "5.3.1", - "port-version": 4, + "version": "5.4.0", "description": "The Open Asset import library", "homepage": "https://github.com/assimp/assimp", "license": "BSD-3-Clause", diff --git a/versions/a-/assimp.json b/versions/a-/assimp.json index 88dc1473b8..f039be3279 100644 --- a/versions/a-/assimp.json +++ b/versions/a-/assimp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56a472ae37754b7b3196df332edd5bb38559b614", + "version": "5.4.0", + "port-version": 0 + }, { "git-tree": "379f3ceb0d492f5d41bd9320cfd519da9b94bfa8", "version": "5.3.1", diff --git a/versions/baseline.json b/versions/baseline.json index 114f192442..5120f3ccb1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -277,8 +277,8 @@ "port-version": 1 }, "assimp": { - "baseline": "5.3.1", - "port-version": 4 + "baseline": "5.4.0", + "port-version": 0 }, "async-mqtt": { "baseline": "4.1.0",