assimp-5.1.6-rev1-windows

Signed-off-by: Allen Jackson <[email protected]>

package-system/assimp/Findassimplib.cmake

@@ -40,10 +40,10 @@ elseif (${PAL_PLATFORM_NAME} STREQUAL "Mac")
     set(${LIB_NAME}_STATIC_LIBRARY_DEBUG   ${${LIB_NAME}_LIBS_DIR}/libassimp.a)
     set(${LIB_NAME}_STATIC_LIBRARY_RELEASE ${${LIB_NAME}_LIBS_DIR}/libassimp.a)
 elseif (${PAL_PLATFORM_NAME} STREQUAL "Windows")
-    set(${LIB_NAME}_LIBRARY_DEBUG   ${${LIB_NAME}_BIN_DIR}/debug/assimp-vc142-mtd.dll)
-    set(${LIB_NAME}_LIBRARY_RELEASE ${${LIB_NAME}_BIN_DIR}/release/assimp-vc142-mt.dll)
-    set(${LIB_NAME}_STATIC_LIBRARY_DEBUG   ${${LIB_NAME}_LIBS_DIR}/debug/assimp-vc142-mtd.lib)
-    set(${LIB_NAME}_STATIC_LIBRARY_RELEASE ${${LIB_NAME}_LIBS_DIR}/release/assimp-vc142-mt.lib)
+    set(${LIB_NAME}_LIBRARY_DEBUG   ${${LIB_NAME}_BIN_DIR}/debug/assimp-vc143-mtd.dll)
+    set(${LIB_NAME}_LIBRARY_RELEASE ${${LIB_NAME}_BIN_DIR}/release/assimp-vc143-mt.dll)
+    set(${LIB_NAME}_STATIC_LIBRARY_DEBUG   ${${LIB_NAME}_LIBS_DIR}/debug/assimp-vc143-mtd.lib)
+    set(${LIB_NAME}_STATIC_LIBRARY_RELEASE ${${LIB_NAME}_LIBS_DIR}/release/assimp-vc143-mt.lib)
 endif()
 
 # set it to a generator expression for multi-config situations

package-system/assimp/PackageInfo.json

@@ -1,5 +1,5 @@
 {
-  "PackageName": "assimp-5.1.6-rev1",
+  "PackageName": "assimp-5.2.5-rev1",
   "URL": "https://github.com/assimp/assimp/blob/master/LICENSE",
   "License": "BSD-3-Clause",
   "LicenseFile": "LICENSE"

package-system/assimp/build_assimp_windows.cmd

@@ -17,6 +17,7 @@ cmake -S temp/src ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_MODULE_PATH="%DOWNLOADED_PACKAGE_FOLDERS%" ^
     -DASSIMP_BUILD_ZLIB=OFF ^
+    -DASSIMP_BUILD_ASSIMP_TOOLS=ON ^
     temp/src/CMakeLists.txt || exit /b 1
 cmake --build temp/src --config release || exit /b 1
 cmake --build temp/src --config debug || exit /b 1
@@ -26,6 +27,7 @@ cmake -S temp/src ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_MODULE_PATH="%DOWNLOADED_PACKAGE_FOLDERS%" ^
     -DASSIMP_BUILD_ZLIB=OFF ^
+    -DASSIMP_BUILD_ASSIMP_TOOLS=ON ^
     temp/src/CMakeLists.txt || exit /b 1
 cmake --build temp/src --config release || exit /b 1
 cmake --build temp/src --config debug || exit /b 1

package-system/assimp/build_config.json

@@ -1,8 +1,8 @@
 {
     "git_url":"https://github.com/assimp/assimp",
-    "git_tag": "v5.1.6",
+    "git_tag": "v5.2.5",
     "package_name":"assimp",
-    "package_version":"5.1.6-rev2",
+    "package_version":"5.2.5-rev1",
     "package_url":"https://github.com/assimp/assimp",
     "package_license":"BSD-3-Clause",
     "package_license_file":"LICENSE",

package-system/assimp/install_assimp_windows.json

@@ -2,16 +2,16 @@
   "Source_Subfolder": "src",
   "Install_Paths": [
     "include/",
-    "lib/Debug/assimp-vc142-mtd.lib",
-    "lib/Debug/assimp-vc142-mtd.pdb",
-    "lib/Release/assimp-vc142-mt.lib",
+    "lib/Debug/assimp-vc143-mtd.lib",
+    "lib/Debug/assimp-vc143-mtd.pdb",
+    "lib/Release/assimp-vc143-mt.lib",
     "bin/Release/assimp.exe",
-    "bin/Release/assimp-vc142-mt.dll",
+    "bin/Release/assimp-vc143-mt.dll",
     "bin/Release/unit.exe",
     "bin/Debug/assimpd.exe",
     "bin/Debug/assimpd.pdb",
-    "bin/Debug/assimp-vc142-mtd.dll",
-    "bin/Debug/assimp-vc142-mtd.pdb",
+    "bin/Debug/assimp-vc143-mtd.dll",
+    "bin/Debug/assimp-vc143-mtd.pdb",
     "bin/Debug/unit.exe",
     "port/PyAssimp/"
   ]

package_build_list_host_windows.json

@@ -4,7 +4,7 @@
     "comment3" : "build_from_folder is package name --> folder containing built image of package",
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
-        "assimp-5.1.6-rev1-windows":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Windows --package-root ../../package-system --clean",
+        "assimp-5.2.5-rev1-windows":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Windows --package-root ../../package-system --clean",
         "astc-encoder-3.2-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Windows --package-root ../../package-system --clean",
         "azslc-1.8.9-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Windows --package-root ../../package-system --clean",
         "AWSGameLiftServerSDK-3.4.2-rev1-windows": "package-system/AWSGameLiftServerSDK/build_package_image.py --platform-name windows",
@@ -63,7 +63,7 @@
   },
   "build_from_folder": {
     "alembic-1.7.11-rev3-multiplatform": "package-system/alembic-multiplatform",
-    "assimp-5.1.6-rev1-windows": "package-system/assimp-windows",
+    "assimp-5.2.5-rev1-windows": "package-system/assimp-windows",
     "astc-encoder-3.2-rev2-windows": "package-system/astc-encoder-windows",
     "azslc-1.8.9-rev1-windows": "package-system/azslc-windows",
     "AWSGameLiftServerSDK-3.4.2-rev1-windows": "package-system/AWSGameLiftServerSDK-windows",