diff --git a/ports/assimp/4542.patch b/ports/assimp/4542.patch new file mode 100644 index 00000000000..62ee6e3f71f --- /dev/null +++ b/ports/assimp/4542.patch @@ -0,0 +1,81 @@ +From affa85a36bbd329c8792b553f64188c1d3a58188 Mon Sep 17 00:00:00 2001 +From: hgdagon +Date: Wed, 25 May 2022 07:59:01 -0700 +Subject: [PATCH 1/2] Fix GNUC check on Windows + +--- + code/Common/DefaultIOStream.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/code/Common/DefaultIOStream.cpp b/code/Common/DefaultIOStream.cpp +index 17fc44f9a2..bbc3b2080f 100644 +--- a/code/Common/DefaultIOStream.cpp ++++ b/code/Common/DefaultIOStream.cpp +@@ -63,7 +63,7 @@ inline int select_fseek(FILE *file, int64_t offset, int origin) { + + + +-#if defined _WIN64 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601) ++#if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 + template <> + inline size_t select_ftell<8>(FILE *file) { + return (size_t)::_ftelli64(file); +@@ -74,7 +74,7 @@ inline int select_fseek<8>(FILE *file, int64_t offset, int origin) { + return ::_fseeki64(file, offset, origin); + } + +-#endif // #if defined _WIN32 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601) ++#endif // #if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 + + } // namespace + +@@ -149,7 +149,7 @@ size_t DefaultIOStream::FileSize() const { + // + // See here for details: + // https://www.securecoding.cert.org/confluence/display/seccode/FIO19-C.+Do+not+use+fseek()+and+ftell()+to+compute+the+size+of+a+regular+file +-#if defined _WIN64 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601) ++#if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 + struct __stat64 fileStat; + //using fileno + fstat avoids having to handle the filename + int err = _fstat64(_fileno(mFile), &fileStat); + +From efbcdccac99a66d513731a2f5af65211c734cfe7 Mon Sep 17 00:00:00 2001 +From: hgdagon +Date: Wed, 25 May 2022 09:18:42 -0700 +Subject: [PATCH 2/2] Fix GNUC check on Windows (2nd attempt) + +--- + code/Common/DefaultIOStream.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/code/Common/DefaultIOStream.cpp b/code/Common/DefaultIOStream.cpp +index bbc3b2080f..d5d5846897 100644 +--- a/code/Common/DefaultIOStream.cpp ++++ b/code/Common/DefaultIOStream.cpp +@@ -63,7 +63,7 @@ inline int select_fseek(FILE *file, int64_t offset, int origin) { + + + +-#if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 ++#if defined _WIN32 && (!defined __GNUC__ || !defined __CLANG__ && __MSVCRT_VERSION__ >= 0x0601) + template <> + inline size_t select_ftell<8>(FILE *file) { + return (size_t)::_ftelli64(file); +@@ -74,7 +74,7 @@ inline int select_fseek<8>(FILE *file, int64_t offset, int origin) { + return ::_fseeki64(file, offset, origin); + } + +-#endif // #if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 ++#endif + + } // namespace + +@@ -149,7 +149,7 @@ size_t DefaultIOStream::FileSize() const { + // + // See here for details: + // https://www.securecoding.cert.org/confluence/display/seccode/FIO19-C.+Do+not+use+fseek()+and+ftell()+to+compute+the+size+of+a+regular+file +-#if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 ++#if defined _WIN32 && (!defined __GNUC__ || !defined __CLANG__ && __MSVCRT_VERSION__ >= 0x0601) + struct __stat64 fileStat; + //using fileno + fstat avoids having to handle the filename + int err = _fstat64(_fileno(mFile), &fileStat); diff --git a/ports/assimp/build_fixes.patch b/ports/assimp/build_fixes.patch index 7590aec96fe..66a7d46f0ae 100644 --- a/ports/assimp/build_fixes.patch +++ b/ports/assimp/build_fixes.patch @@ -1,249 +1,135 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index dcafb64..761040d 100644 +index 2aa6642..e74f93c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -51,7 +51,7 @@ IF(HUNTER_ENABLED) +@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED) add_definitions(-DASSIMP_USE_HUNTER) - ENDIF(HUNTER_ENABLED) + ENDIF() --PROJECT( Assimp VERSION 5.0.0 ) -+PROJECT( Assimp VERSION 5.0.1 ) +-PROJECT(Assimp VERSION 5.2.0) ++PROJECT(Assimp VERSION 5.2.4) # All supported options ############################################### -@@ -130,6 +130,16 @@ OPTION ( IGNORE_GIT_HASH - OFF - ) - -+find_package(Stb REQUIRED) -+include_directories(${Stb_INCLUDE_DIR}) -+find_package(utf8cpp CONFIG REQUIRED) -+link_libraries(utf8cpp) -+find_package(RapidJSON CONFIG REQUIRED) -+include_directories(${RAPIDJSON_INCLUDE_DIRS}) -+find_path(UNZIP_INCLUDE_DIRS "minizip/unzip.h") -+include_directories(${UNZIP_INCLUDE_DIRS}/minizip) -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/contrib) -+ - IF (IOS AND NOT HUNTER_ENABLED) - IF (NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE "Release") -@@ -230,10 +240,8 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M - SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev) - SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names") - --IF( UNIX ) - # Use GNUInstallDirs for Unix predefined directories - INCLUDE(GNUInstallDirs) --ENDIF( UNIX ) - - # Grouped compiler settings - IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) -@@ -253,7 +261,6 @@ ELSEIF(MSVC) - IF(MSVC12) - ADD_COMPILE_OPTIONS(/wd4351) +@@ -273,18 +273,18 @@ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW) + ELSEIF(MSVC) + # enable multi-core compilation with MSVC + IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) # clang-cl +- ADD_COMPILE_OPTIONS(/bigobj /W4 /WX ) ++ ADD_COMPILE_OPTIONS(/bigobj) + ELSE() # msvc +- ADD_COMPILE_OPTIONS(/MP /bigobj /W4 /WX) ++ ADD_COMPILE_OPTIONS(/MP /bigobj) ENDIF() -- SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob2 /DEBUG:FULL /Zi") - ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) - IF(NOT HUNTER_ENABLED) - SET(CMAKE_CXX_FLAGS "-fPIC -std=c++11 ${CMAKE_CXX_FLAGS}") -@@ -352,35 +359,21 @@ IF (NOT TARGET uninstall) - ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - ENDIF() + # disable "elements of array '' will be default initialized" warning on MSVC2013 + IF(MSVC12) + ADD_COMPILE_OPTIONS(/wd4351) + ENDIF() + ADD_COMPILE_OPTIONS(/wd4244) #supress warning for double to float conversion if Double precission is activated +- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") +- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") +- 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} /Zi") ++ #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_CXX_STANDARD 11) +@@ -414,7 +414,7 @@ ENDIF() --IF(HUNTER_ENABLED) -- set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") -+ set(CONFIG_INSTALL_DIR "share/assimp") - set(INCLUDE_INSTALL_DIR "include") + set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -- set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -+ string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) -+ set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") - -- # Configuration -- set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") -- set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") -- set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") -- set(NAMESPACE "${PROJECT_NAME}::") -+ set(TARGETS_EXPORT_NAME "${PROJECT_NAME_LOWERCASE}Config") -+ set(VERSION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWERCASE}ConfigVersion.cmake") -+ set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") - -- # Include module with fuction 'write_basic_package_version_file' - include(CMakePackageConfigHelpers) -- -- # Note: PROJECT_VERSION is used as a VERSION -- write_basic_package_version_file("${VERSION_CONFIG}" COMPATIBILITY SameMajorVersion) -- -- # Use variables: -- # * TARGETS_EXPORT_NAME -- # * PROJECT_NAME -- configure_package_config_file( -- "cmake/assimp-hunter-config.cmake.in" -- "${PROJECT_CONFIG}" -- INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}" -- ) -+ write_basic_package_version_file("${VERSION_CONFIG}" VERSION ${${PROJECT_NAME}_VERSION} COMPATIBILITY SameMajorVersion) - - install( -- FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" -+ FILES ${VERSION_CONFIG} - DESTINATION "${CONFIG_INSTALL_DIR}" - ) - -@@ -389,30 +382,6 @@ IF(HUNTER_ENABLED) - NAMESPACE "${NAMESPACE}" - DESTINATION "${CONFIG_INSTALL_DIR}" - ) --ELSE(HUNTER_ENABLED) -- # cmake configuration files -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE) -- IF (is_multi_config) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE) -- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake") -- ELSEIF (CMAKE_BUILD_TYPE STREQUAL Debug) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE) -- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake") -- ELSE() -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE) -- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake") -- ENDIF() -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config-version.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" @ONLY IMMEDIATE) -- #we should generated these scripts after CMake VERSION 3.0.2 using export(EXPORT ...) and write_basic_package_version_file(...) -- INSTALL(FILES -- "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" -- "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" -- "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" -- ${PACKAGE_TARGETS_FILE} -- DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT}) --ENDIF(HUNTER_ENABLED) - - FIND_PACKAGE( DirectX ) - -@@ -422,63 +391,19 @@ ENDIF( BUILD_DOCS ) - - # Look for system installed irrXML - IF ( SYSTEM_IRRXML ) -- FIND_PACKAGE( IrrXML REQUIRED ) -+ FIND_PACKAGE( irrlicht CONFIG REQUIRED ) - ENDIF( SYSTEM_IRRXML ) +-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}::") +@@ -422,7 +422,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}::") +@@ -464,14 +464,14 @@ ENDIF() # Search for external dependencies, and build them from source if not found # Search for zlib --IF(HUNTER_ENABLED) +-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) --ELSE(HUNTER_ENABLED) -- IF ( NOT ASSIMP_BUILD_ZLIB ) -- FIND_PACKAGE(ZLIB) -- ENDIF( NOT ASSIMP_BUILD_ZLIB ) -- -- IF( NOT ZLIB_FOUND ) -- MESSAGE(STATUS "compiling zlib from sources") -- INCLUDE(CheckIncludeFile) -- INCLUDE(CheckTypeSize) -- INCLUDE(CheckFunctionExists) -- -- # Explicitly turn off ASM686 and AMD64 cmake options. -- # The AMD64 option causes a build failure on MSVC and the ASM builds seem to have problems: -- # https://github.com/madler/zlib/issues/41#issuecomment-125848075 -- # Also prevents these options from "polluting" the cmake options if assimp is being -- # included as a submodule. -- set( ASM686 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE ) -- set( AMD64 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE ) -- -- # compile from sources -- ADD_SUBDIRECTORY(contrib/zlib) -- SET(ZLIB_FOUND 1) -- SET(ZLIB_LIBRARIES zlibstatic) -- SET(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/contrib/zlib ${CMAKE_CURRENT_BINARY_DIR}/contrib/zlib) -- # need to ensure we don't link with system zlib or minizip as well. -- SET(ASSIMP_BUILD_MINIZIP 1) -- ELSE(NOT ZLIB_FOUND) -- ADD_DEFINITIONS(-DASSIMP_BUILD_NO_OWN_ZLIB) -- SET(ZLIB_LIBRARIES_LINKED -lz) -- ENDIF(NOT ZLIB_FOUND) + set(ZLIB_LIBRARIES ZLIB::ZLIB) - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) --ENDIF(HUNTER_ENABLED) - --IF( NOT IOS ) -- IF( NOT ASSIMP_BUILD_MINIZIP ) -- use_pkgconfig(UNZIP minizip) -- ENDIF( NOT ASSIMP_BUILD_MINIZIP ) --ELSE ( NOT IOS ) -- IF( NOT BUILD_SHARED_LIBS ) -- IF( NOT ASSIMP_BUILD_MINIZIP ) -- use_pkgconfig(UNZIP minizip) -- ENDIF( NOT ASSIMP_BUILD_MINIZIP ) -- ENDIF ( NOT BUILD_SHARED_LIBS ) --ENDIF ( NOT IOS ) -+ find_package(minizip CONFIG REQUIRED) - - IF ( ASSIMP_NO_EXPORT ) - ADD_DEFINITIONS( -DASSIMP_BUILD_NO_EXPORT) -@@ -633,7 +558,7 @@ IF(CMAKE_CPACK_COMMAND AND UNIX AND ASSIMP_OPT_BUILD_PACKAGES) - INCLUDE(DebSourcePPA) ++ 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 ) +@@ -512,12 +512,12 @@ ELSE() ENDIF() --if(WIN32) -+if(0) - if (CMAKE_SIZEOF_VOID_P EQUAL 8) - SET(BIN_DIR "${PROJECT_SOURCE_DIR}/bin64/") - SET(LIB_DIR "${PROJECT_SOURCE_DIR}/lib64/") -@@ -677,4 +602,4 @@ if(WIN32) - ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM) + 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(MSVC12 OR MSVC14 OR MSVC15 ) --ENDIF (WIN32) -+ENDIF (0) -diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in -index ab1a8d2..4b0729b 100644 ---- a/assimpTargets.cmake.in -+++ b/assimpTargets.cmake.in -@@ -5,6 +5,8 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) - endif() - cmake_policy(PUSH) - cmake_policy(VERSION 2.6) -+# Required for the evaluation of "if(@BUILD_SHARED_LIBS@)" below to function -+cmake_policy(SET CMP0012 NEW) - #---------------------------------------------------------------- - # Generated CMake target import file. - #---------------------------------------------------------------- -diff --git a/code/3MF/D3MFExporter.cpp b/code/3MF/D3MFExporter.cpp -index 1f388ad..1ccd2aa 100644 ---- a/code/3MF/D3MFExporter.cpp -+++ b/code/3MF/D3MFExporter.cpp -@@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + 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(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 + #include #else --# include -+# include +-#include ++#include #endif namespace Assimp { -@@ -255,7 +255,7 @@ void D3MFExporter::writeBaseMaterials() { - hexDiffuseColor.clear(); - tmp.clear(); - hexDiffuseColor = "#"; -- -+ - tmp = DecimalToHexa( color.r ); - hexDiffuseColor += tmp; - tmp = DecimalToHexa( color.g ); -diff --git a/code/Blender/BlenderTessellator.h b/code/Blender/BlenderTessellator.h -index 518e56c..ec4a653 100644 ---- a/code/Blender/BlenderTessellator.h -+++ b/code/Blender/BlenderTessellator.h +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 @@ -147,7 +147,7 @@ namespace Assimp #ifdef ASSIMP_USE_HUNTER # include @@ -253,374 +139,394 @@ index 518e56c..ec4a653 100644 #endif namespace Assimp -diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt -index 55538d9..f5553e5 100644 ---- a/code/CMakeLists.txt -+++ b/code/CMakeLists.txt -@@ -862,89 +862,24 @@ SET( Extra_SRCS - SOURCE_GROUP( Extra FILES ${Extra_SRCS}) - - # irrXML --IF(HUNTER_ENABLED) -- hunter_add_package(irrXML) - find_package(irrXML CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- # irrXML already included in contrib directory by parent CMakeLists.txt. --ENDIF(HUNTER_ENABLED) -- --# utf8 --IF(HUNTER_ENABLED) -- hunter_add_package(utf8) -- find_package(utf8 CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- # utf8 is header-only, so Assimp doesn't need to do anything. --ENDIF(HUNTER_ENABLED) - - # polyclipping --IF(HUNTER_ENABLED) -- hunter_add_package(polyclipping) - find_package(polyclipping CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) - SET( Clipper_SRCS - ../contrib/clipper/clipper.hpp - ../contrib/clipper/clipper.cpp - ) - SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS}) --ENDIF(HUNTER_ENABLED) - - # poly2tri --IF(HUNTER_ENABLED) -- hunter_add_package(poly2tri) - find_package(poly2tri CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- SET( Poly2Tri_SRCS -- ../contrib/poly2tri/poly2tri/common/shapes.cc -- ../contrib/poly2tri/poly2tri/common/shapes.h -- ../contrib/poly2tri/poly2tri/common/utils.h -- ../contrib/poly2tri/poly2tri/sweep/advancing_front.h -- ../contrib/poly2tri/poly2tri/sweep/advancing_front.cc -- ../contrib/poly2tri/poly2tri/sweep/cdt.cc -- ../contrib/poly2tri/poly2tri/sweep/cdt.h -- ../contrib/poly2tri/poly2tri/sweep/sweep.cc -- ../contrib/poly2tri/poly2tri/sweep/sweep.h -- ../contrib/poly2tri/poly2tri/sweep/sweep_context.cc -- ../contrib/poly2tri/poly2tri/sweep/sweep_context.h -- ) -- SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS}) --ENDIF(HUNTER_ENABLED) - - # minizip/unzip --IF(HUNTER_ENABLED) -- hunter_add_package(minizip) - find_package(minizip CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- SET( unzip_SRCS -- ../contrib/unzip/crypt.h -- ../contrib/unzip/ioapi.c -- ../contrib/unzip/ioapi.h -- ../contrib/unzip/unzip.c -- ../contrib/unzip/unzip.h -- ) -- SOURCE_GROUP(Contrib\\unzip FILES ${unzip_SRCS}) --ENDIF(HUNTER_ENABLED) - - # zip (https://github.com/kuba--/zip) --IF(HUNTER_ENABLED) -- hunter_add_package(zip) -- find_package(zip CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- SET( ziplib_SRCS -- ../contrib/zip/src/miniz.h -- ../contrib/zip/src/zip.c -- ../contrib/zip/src/zip.h -- ) -- -- # 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") -- add_definitions(-DMINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) -- else() -- add_compile_definitions(MINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) -- endif() -- -- SOURCE_GROUP( ziplib FILES ${ziplib_SRCS} ) --ENDIF(HUNTER_ENABLED) -+ find_package(kubazip CONFIG REQUIRED) - - # openddlparser - IF(HUNTER_ENABLED) -@@ -1021,13 +956,7 @@ ELSE () - ENDIF () - - # RapidJSON --IF(HUNTER_ENABLED) -- hunter_add_package(RapidJSON) - find_package(RapidJSON CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- INCLUDE_DIRECTORIES( "../contrib/rapidjson/include" ) -- INCLUDE_DIRECTORIES( "../contrib" ) --ENDIF(HUNTER_ENABLED) - - # VC2010 fixes - if(MSVC10) -@@ -1044,15 +973,6 @@ if ( MSVC ) - ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) - endif ( MSVC ) - --IF(NOT HUNTER_ENABLED) -- if (UNZIP_FOUND) -- SET (unzip_compile_SRCS "") -- else (UNZIP_FOUND) -- SET (unzip_compile_SRCS ${unzip_SRCS}) -- INCLUDE_DIRECTORIES( "../contrib/unzip/" ) -- endif (UNZIP_FOUND) --ENDIF(NOT HUNTER_ENABLED) -- - MESSAGE(STATUS "Enabled importer formats:${ASSIMP_IMPORTERS_ENABLED}") - MESSAGE(STATUS "Disabled importer formats:${ASSIMP_IMPORTERS_DISABLED}") - -@@ -1111,22 +1031,14 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC - $ - ) - --IF(HUNTER_ENABLED) - TARGET_LINK_LIBRARIES(assimp -- PUBLIC - polyclipping::polyclipping - irrXML::irrXML -- openddlparser::openddl_parser -- poly2tri::poly2tri - minizip::minizip -- ZLIB::zlib -- RapidJSON::rapidjson -- utf8::utf8 -- zip::zip -+ ZLIB::ZLIB -+ kubazip::kubazip -+ poly2tri::poly2tri - ) --ELSE(HUNTER_ENABLED) -- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} ) --ENDIF(HUNTER_ENABLED) - - if(ASSIMP_ANDROID_JNIIOSYSTEM) - set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI) -@@ -1208,21 +1120,12 @@ ENDIF(APPLE) - - # Build against external unzip, or add ../contrib/unzip so - # assimp can #include "unzip.h" --IF(NOT HUNTER_ENABLED) -- if (UNZIP_FOUND) -- INCLUDE_DIRECTORIES(${UNZIP_INCLUDE_DIRS}) -- TARGET_LINK_LIBRARIES(assimp ${UNZIP_LIBRARIES}) -- else (UNZIP_FOUND) -- INCLUDE_DIRECTORIES("../") -- endif (UNZIP_FOUND) --ENDIF(NOT HUNTER_ENABLED) - - # Add RT-extension library for glTF importer with Open3DGC-compression. - IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) - TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY}) - ENDIF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) - --IF(HUNTER_ENABLED) - INSTALL( TARGETS assimp - EXPORT "${TARGETS_EXPORT_NAME}" - LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -@@ -1231,14 +1134,6 @@ IF(HUNTER_ENABLED) - FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} - COMPONENT ${LIBASSIMP_COMPONENT} - INCLUDES DESTINATION "include") --ELSE(HUNTER_ENABLED) --INSTALL( TARGETS assimp -- LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} -- FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- COMPONENT ${LIBASSIMP_COMPONENT}) --ENDIF(HUNTER_ENABLED) - INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev) - INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev) - -diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp -index b77bbfe..51cba43 100644 ---- a/code/Common/BaseImporter.cpp -+++ b/code/Common/BaseImporter.cpp -@@ -344,7 +344,7 @@ std::string BaseImporter::GetExtension( const std::string& file ) { - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include "../contrib/utf8cpp/source/utf8.h" -+# include - #endif - - // ------------------------------------------------------------------------------------------------ -@@ -364,8 +364,8 @@ void BaseImporter::ConvertToUTF8(std::vector& data) - data.resize(data.size()-3); - return; - } -- -- -+ -+ - // UTF 32 BE with BOM - if(*((uint32_t*)&data.front()) == 0xFFFE0000) { - -@@ -507,7 +507,7 @@ struct Assimp::BatchData { - , next_id(0xffff) - , validate( validate ) { - ai_assert( nullptr != pIO ); -- -+ - pImporter = new Importer(); - pImporter->SetIOHandler( pIO ); - } -diff --git a/code/Importer/IFC/IFCGeometry.cpp b/code/Importer/IFC/IFCGeometry.cpp -index d1c7aee..8e11373 100644 ---- a/code/Importer/IFC/IFCGeometry.cpp -+++ b/code/Importer/IFC/IFCGeometry.cpp -@@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #ifdef ASSIMP_USE_HUNTER +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 +@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # include --# include -+# include "../contrib/clipper/clipper.hpp" + # include #else -# include "../contrib/poly2tri/poly2tri/poly2tri.h" +# include # include "../contrib/clipper/clipper.hpp" #endif -diff --git a/code/Importer/IFC/IFCOpenings.cpp b/code/Importer/IFC/IFCOpenings.cpp -index d6c40b3..387c625 100644 ---- a/code/Importer/IFC/IFCOpenings.cpp -+++ b/code/Importer/IFC/IFCOpenings.cpp -@@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - +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 +@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # include --# include -+# include "../contrib/clipper/clipper.hpp" + # include #else -# include "../contrib/poly2tri/poly2tri/poly2tri.h" +# include # include "../contrib/clipper/clipper.hpp" #endif -@@ -911,14 +911,14 @@ size_t CloseWindows(ContourVector& contours, - // compare base poly normal and contour normal to detect if we need to reverse the face winding - if(curmesh.mVertcnt.size() > 0) { - IfcVector3 basePolyNormal = TempMesh::ComputePolygonNormal(curmesh.mVerts.data(), curmesh.mVertcnt.front()); -- -+ - std::vector worldSpaceContourVtx(it->contour.size()); -- -+ - for(size_t a = 0; a < it->contour.size(); ++a) - worldSpaceContourVtx[a] = minv * IfcVector3(it->contour[a].x, it->contour[a].y, 0.0); -- -+ - IfcVector3 contourNormal = TempMesh::ComputePolygonNormal(worldSpaceContourVtx.data(), worldSpaceContourVtx.size()); -- -+ - reverseCountourFaces = (contourNormal * basePolyNormal) > 0.0; - } - -diff --git a/code/Importer/STEPParser/STEPFileEncoding.cpp b/code/Importer/STEPParser/STEPFileEncoding.cpp -index 101dcdf..3f12403 100644 ---- a/code/Importer/STEPParser/STEPFileEncoding.cpp -+++ b/code/Importer/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/MMD/MMDPmxParser.cpp b/code/MMD/MMDPmxParser.cpp -index 80f0986..47725e2 100644 ---- a/code/MMD/MMDPmxParser.cpp -+++ b/code/MMD/MMDPmxParser.cpp +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 + # include #else -# include "../contrib/utf8cpp/source/utf8.h" +# include #endif #include -@@ -102,7 +102,7 @@ namespace pmx - const unsigned int targetSize = size * 3; // enough to encode - char *targetStart = new char[targetSize]; - std::memset(targetStart, 0, targetSize * sizeof(char)); -- -+ - utf8::utf16to8( sourceStart, sourceStart + size/2, targetStart ); - - std::string result(targetStart); -diff --git a/code/SIB/SIBImporter.cpp b/code/SIB/SIBImporter.cpp -index 20cdc80..46e9a32 100644 ---- a/code/SIB/SIBImporter.cpp -+++ b/code/SIB/SIBImporter.cpp -@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - # include - #else - //# include "../contrib/ConvertUTF/ConvertUTF.h" --# include "../contrib/utf8cpp/source/utf8.h" -+# include - #endif - #include - #include -@@ -90,10 +90,10 @@ struct SIBChunk { - uint32_t Size; - } PACK_STRUCT; - --enum { -- POS, -- NRM, -- UV, -+enum { -+ POS, -+ NRM, -+ UV, - N - }; - -diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp -index 9bb2c69..525a084 100644 ---- a/code/X3D/FIReader.cpp -+++ b/code/X3D/FIReader.cpp -@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +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 + #include #else --# include "../contrib/utf8cpp/source/utf8.h" +-#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 - #include -diff --git a/contrib/clipper/clipper.hpp b/contrib/clipper/clipper.hpp -index 7cdac6c..2728425 100644 ---- a/contrib/clipper/clipper.hpp -+++ b/contrib/clipper/clipper.hpp -@@ -302,5 +302,3 @@ class clipperException : public std::exception - } //ClipperLib namespace - #endif //clipper_hpp -- -- -diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp -index 8d25aaa..e4bc306 100644 ---- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp -+++ b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp -@@ -19,7 +19,7 @@ - #include + #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}) - #define STB_IMAGE_IMPLEMENTATION --#include "contrib/stb_image/stb_image.h" + # pugixml +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(pugixml) ++IF(1) ++ #hunter_add_package(pugixml) + find_package(pugixml CONFIG REQUIRED) + ELSE() + SET( Pugixml_SRCS +@@ -910,15 +910,15 @@ 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(0) + hunter_add_package(polyclipping) + find_package(polyclipping CONFIG REQUIRED) + ELSE() +@@ -930,8 +930,8 @@ ELSE() + ENDIF() + + # poly2tri +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(poly2tri) ++IF(1) ++ #hunter_add_package(poly2tri) + find_package(poly2tri CONFIG REQUIRED) + ELSE() + SET( Poly2Tri_SRCS +@@ -951,8 +951,8 @@ ELSE() + ENDIF() + + # minizip/unzip +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(minizip) ++IF(1) ++ #hunter_add_package(minizip) + find_package(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 + minizip::minizip +- ZLIB::zlib +- RapidJSON::rapidjson ++ ZLIB::ZLIB ++ rapidjson + 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_LIBRARY}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${RT_LIBRARY}) + ENDIF () + + +diff --git a/code/Common/Assimp.cpp b/code/Common/Assimp.cpp +index 71e312c..fa7fc36 100644 +--- a/code/Common/Assimp.cpp ++++ b/code/Common/Assimp.cpp +@@ -1290,7 +1290,7 @@ ASSIMP_API void aiQuaternionInterpolate( + # endif + + # define STB_IMAGE_IMPLEMENTATION +-# 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 e0c9883..78b522a 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 { +@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) { + zlib_filefunc_def mapping; + + mapping.zopen_file = (open_file_func)open; ++#ifdef ZOPENDISK64 + mapping.zopendisk_file = (opendisk_file_func)opendisk; ++#endif + mapping.zread_file = (read_file_func)read; + mapping.zwrite_file = (write_file_func)write; + mapping.ztell_file = (tell_file_func)tell; +diff --git a/code/Pbrt/PbrtExporter.cpp b/code/Pbrt/PbrtExporter.cpp +index 9590c49..e23b9b1 100644 +--- a/code/Pbrt/PbrtExporter.cpp ++++ b/code/Pbrt/PbrtExporter.cpp +@@ -83,7 +83,7 @@ Other: + #include + #include + +-#include "stb/stb_image.h" +#include - #include + using namespace Assimp; diff --git a/ports/assimp/irrlicht.patch b/ports/assimp/irrlicht.patch deleted file mode 100644 index 3457056c4f0..00000000000 --- a/ports/assimp/irrlicht.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt -index f5553e5..5cffa0c 100644 ---- a/code/CMakeLists.txt -+++ b/code/CMakeLists.txt -@@ -862,7 +862,7 @@ SET( Extra_SRCS - SOURCE_GROUP( Extra FILES ${Extra_SRCS}) - - # irrXML -- find_package(irrXML CONFIG REQUIRED) -+ find_package(irrlicht CONFIG REQUIRED) - - # polyclipping - find_package(polyclipping CONFIG REQUIRED) -@@ -1033,7 +1033,7 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC - - TARGET_LINK_LIBRARIES(assimp - polyclipping::polyclipping -- irrXML::irrXML -+ Irrlicht - minizip::minizip - ZLIB::ZLIB - kubazip::kubazip -diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp -index 525a084..0cbca48 100644 ---- a/code/X3D/FIReader.cpp -+++ b/code/X3D/FIReader.cpp -@@ -654,8 +654,8 @@ public: - return currentNodeType; - } - -- virtual int getAttributeCount() const /*override*/ { -- return static_cast(attributes.size()); -+ virtual unsigned int getAttributeCount() const /*override*/ { -+ return static_cast(attributes.size()); - } - - virtual const char* getAttributeName(int idx) const /*override*/ { -@@ -1733,7 +1733,7 @@ public: - return reader->getNodeType(); - } - -- virtual int getAttributeCount() const /*override*/ { -+ virtual unsigned int getAttributeCount() const /*override*/ { - return reader->getAttributeCount(); - } - -diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h -index 77cfd5e..ba584a0 100644 ---- a/include/assimp/irrXMLWrapper.h -+++ b/include/assimp/irrXMLWrapper.h -@@ -133,8 +133,8 @@ public: - - // ---------------------------------------------------------------------------------- - //! Returns size of file in bytes -- virtual int getSize() { -- return (int)data.size(); -+ virtual long getSize() const override { -+ return (long)data.size(); - } - - private: diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index 3527124ce16..c3083bac4a5 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -1,51 +1,51 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO assimp/assimp - REF 8f0c6b04b2257a520aaab38421b2e090204b69df # v5.0.1 - SHA512 59b213428e2f7494cb5da423e6b2d51556318f948b00cea420090d74d4f5f0f8970d38dba70cd47b2ef35a1f57f9e15df8597411b6cd8732b233395080147c0f + REF v5.2.4 + SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf HEAD_REF master PATCHES build_fixes.patch - irrlicht.patch + 4542.patch # https://github.com/assimp/assimp/pull/4542 ) -file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake) -file(REMOVE ${SOURCE_PATH}/cmake-modules/FindIrrXML.cmake) -#file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/clipper) # https://github.com/assimp/assimp/issues/788 -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/poly2tri) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/gtest) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/irrXML) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/rapidjson) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/stb_image) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zip) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/unzip) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/utf8cpp) -#file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/Open3DGC) #TODO -#file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/openddlparser) #TODO +file(REMOVE "${SOURCE_PATH}/cmake-modules/FindZLIB.cmake") + +#file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/clipper") # https://github.com/assimp/assimp/issues/788 +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/draco") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/gtest") +#file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/Open3DGC") #TODO +#file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/openddlparser") #TODO +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/poly2tri") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/pugixml") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/rapidjson") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/stb") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/unzip") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/utf8cpp") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/zip") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/zlib") set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ASSIMP_BUILD_SHARED_LIBS) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DASSIMP_BUILD_TESTS=OFF - -DASSIMP_BUILD_ASSIMP_VIEW=OFF - -DASSIMP_BUILD_ZLIB=OFF - -DASSIMP_BUILD_SHARED_LIBS=${ASSIMP_BUILD_SHARED_LIBS} - -DASSIMP_BUILD_ASSIMP_TOOLS=OFF - -DASSIMP_INSTALL_PDB=OFF - -DSYSTEM_IRRXML=ON - -DIGNORE_GIT_HASH=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DASSIMP_BUILD_ZLIB=OFF + -DASSIMP_BUILD_ASSIMP_TOOLS=OFF + -DASSIMP_BUILD_TESTS=OFF + -DASSIMP_WARNINGS_AS_ERRORS=OFF + -DASSIMP_IGNORE_GIT_HASH=ON + -DASSIMP_INSTALL_PDB=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/assimp") + +vcpkg_copy_pdbs() if(VCPKG_TARGET_IS_WINDOWS) - set(VCVER vc140 vc141 vc142 ) + set(VCVER vc140 vc141 vc142 vc143) set(CRT mt md) set(DBG_NAMES) set(REL_NAMES) @@ -67,24 +67,9 @@ if(ASSIMP_DBG) get_filename_component(ASSIMP_NAME_DBG "${ASSIMP_DBG}" NAME_WLE) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_DBG}") endif() - -vcpkg_fixup_cmake_targets() vcpkg_fixup_pkgconfig() # Probably requires more fixing for static builds. See qt5-3d and the config changes below -vcpkg_copy_pdbs() -file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimpConfig.cmake ASSIMP_CONFIG) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/assimp/assimpConfig.cmake " -include(CMakeFindDependencyMacro) -find_dependency(ZLIB) -find_dependency(irrlicht CONFIG) -find_dependency(polyclipping CONFIG) -find_dependency(minizip CONFIG) -find_dependency(kubazip CONFIG) -find_dependency(poly2tri CONFIG) -find_dependency(utf8cpp CONFIG) -${ASSIMP_CONFIG}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/assimp/vcpkg.json b/ports/assimp/vcpkg.json index 3e573c17d5a..0bffddb8433 100644 --- a/ports/assimp/vcpkg.json +++ b/ports/assimp/vcpkg.json @@ -1,18 +1,26 @@ { "name": "assimp", - "version-string": "5.0.1", - "port-version": 5, + "version": "5.2.4", "description": "The Open Asset import library", "homepage": "https://github.com/assimp/assimp", + "license": "BSD-3-Clause", "dependencies": [ - "irrlicht", + "draco", "kubazip", "minizip", "poly2tri", - "polyclipping", + "pugixml", "rapidjson", "stb", "utfcpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake index 5e37676c575..95815d67196 100644 --- a/ports/qt5-3d/portfile.cmake +++ b/ports/qt5-3d/portfile.cmake @@ -28,13 +28,10 @@ find_library(LIBPNG_REL NAMES png16 libpng16 PATHS "${CURRENT_INSTALLED_DIR}/lib find_library(LIBPNG_DBG NAMES png16 png16d libpng16 libpng16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ZLIB_REL NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ZLIB_DBG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(IRRLICHT_REL NAMES Irrlicht PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(IRRLICHT_DBG NAMES Irrlicht PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(POLYCLIPPING_REL NAMES polyclipping PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(POLYCLIPPING_DBG NAMES polyclipping polyclippingd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(PUGIXML_REL NAMES pugixml PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(PUGIXML_DBG NAMES pugixml pugixmld PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(POLY2TRI_REL NAMES poly2tri PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(POLY2TRI_DBG NAMES poly2tri poly2trid PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -# poly2tri find_library(BZ2_REL bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(BZ2_DBG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) if(BZ2_REL) @@ -50,7 +47,7 @@ elseif(VCPKG_TARGET_IS_OSX) else() set(SYSTEM_LIBS "-lGL -lXxf86vm -lX11") endif() -set(OPT_REL "ASSIMP_LIBS=${ASSIMP_REL} ${POLYCLIPPING_REL} ${POLY2TRI_REL} ${IRRLICHT_REL} ${JPEG_REL} ${LIBPNG_REL} ${KUBAZIP_REL} ${MINIZIP_REL} ${ZLIB_REL} ${SYSTEM_LIBS}") -set(OPT_DBG "ASSIMP_LIBS=${ASSIMP_DBG} ${POLYCLIPPING_DBG} ${POLY2TRI_DBG} ${IRRLICHT_DBG} ${JPEG_DBG} ${LIBPNG_DBG} ${KUBAZIP_DBG} ${MINIZIP_DBG} ${ZLIB_DBG} ${SYSTEM_LIBS}") +set(OPT_REL "ASSIMP_LIBS=${ASSIMP_REL} ${PUGIXML_REL} ${POLY2TRI_REL} ${JPEG_REL} ${LIBPNG_REL} ${KUBAZIP_REL} ${MINIZIP_REL} ${ZLIB_REL} ${SYSTEM_LIBS}") +set(OPT_DBG "ASSIMP_LIBS=${ASSIMP_DBG} ${PUGIXML_DBG} ${POLY2TRI_DBG} ${JPEG_DBG} ${LIBPNG_DBG} ${KUBAZIP_DBG} ${MINIZIP_DBG} ${ZLIB_DBG} ${SYSTEM_LIBS}") qt_submodule_installation(BUILD_OPTIONS ${OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index 7094659eddd..4eaf5404648 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-3d", "version": "5.15.5", + "port-version": 1, "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", "license": null, "dependencies": [ diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index b5ea85cc878..54a01f5cbfc 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtquick3d", "version": "6.3.1", + "port-version": 1, "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, @@ -26,7 +27,6 @@ ], "features": { "assimp": { - "$comment": "feature assimp requires a newer version of assimp than available within vcpkg. Install assimp with e.g. --head or use an overlay", "description": "assimp", "dependencies": [ "assimp" diff --git a/versions/a-/assimp.json b/versions/a-/assimp.json index a8986e751c3..012a0e0c253 100644 --- a/versions/a-/assimp.json +++ b/versions/a-/assimp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28eaf490bb2eaaf52c344b8e8dc16d4619cb863e", + "version": "5.2.4", + "port-version": 0 + }, { "git-tree": "cab54d6dedc48fcb9642f5fbe079e61105405543", "version-string": "5.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index f2b17f660e1..334cf9bc4a7 100755 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -201,8 +201,8 @@ "port-version": 1 }, "assimp": { - "baseline": "5.0.1", - "port-version": 5 + "baseline": "5.2.4", + "port-version": 0 }, "asynch": { "baseline": "2019-09-21", @@ -5746,7 +5746,7 @@ }, "qt5-3d": { "baseline": "5.15.5", - "port-version": 0 + "port-version": 1 }, "qt5-activeqt": { "baseline": "5.15.5", @@ -6006,7 +6006,7 @@ }, "qtquick3d": { "baseline": "6.3.1", - "port-version": 0 + "port-version": 1 }, "qtquickcontrols2": { "baseline": "deprecated", diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index 71119fd8cf0..de753f204df 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47a71a5fc9720cda647f0d1693f95024b434b5d3", + "version": "5.15.5", + "port-version": 1 + }, { "git-tree": "bdd0dea463c7b380c2747fcd45336712c4a381a5", "version": "5.15.5", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 7b6d067affc..e6c1804bafd 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd80e49b7976333f599d55bd5b186b2605f17700", + "version": "6.3.1", + "port-version": 1 + }, { "git-tree": "c3b68a69ca91b7485ada2416293d0a9447d0ba95", "version": "6.3.1",