Turn off building assimp tools; only the assimp libraries are require…

…d by O3DE Signed-off-by: AMZN-Gene <[email protected]>
o3de · Sep 30, 2024 · 9cbdaf0 · 9cbdaf0
1 parent 3ebfc59
commit 9cbdaf0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 18 deletions.
diff --git a/package-system/assimp/Findassimplib.cmake b/package-system/assimp/Findassimplib.cmake
@@ -30,13 +30,13 @@ set(${LIB_NAME}_BIN_DIR ${CMAKE_CURRENT_LIST_DIR}/assimp/bin)
 set(${LIB_NAME}_LIBS_DIR ${CMAKE_CURRENT_LIST_DIR}/assimp/lib)
 
 if (${PAL_PLATFORM_NAME} STREQUAL "Linux")
-    set(${LIB_NAME}_LIBRARY_DEBUG   ${${LIB_NAME}_BIN_DIR}/libassimp.so.5.2.4)
-    set(${LIB_NAME}_LIBRARY_RELEASE ${${LIB_NAME}_BIN_DIR}/libassimp.so.5.2.4)
+    set(${LIB_NAME}_LIBRARY_DEBUG   ${${LIB_NAME}_BIN_DIR}/libassimp.so.5.4.3)
+    set(${LIB_NAME}_LIBRARY_RELEASE ${${LIB_NAME}_BIN_DIR}/libassimp.so.5.4.3)
     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 "Mac")
-    set(${LIB_NAME}_LIBRARY_DEBUG   ${${LIB_NAME}_BIN_DIR}/libassimp.5.2.4.dylib)
-    set(${LIB_NAME}_LIBRARY_RELEASE ${${LIB_NAME}_BIN_DIR}/libassimp.5.2.4.dylib)
+    set(${LIB_NAME}_LIBRARY_DEBUG   ${${LIB_NAME}_BIN_DIR}/libassimp.5.4.3.dylib)
+    set(${LIB_NAME}_LIBRARY_RELEASE ${${LIB_NAME}_BIN_DIR}/libassimp.5.4.3.dylib)
     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")

diff --git a/package-system/assimp/build_assimp_unix_like.sh b/package-system/assimp/build_assimp_unix_like.sh
@@ -8,7 +8,7 @@
 #
 
 # -Wno-error, turning off warnings as errors because Assimp uses TinyUSDZ for USD support which has compiler warnings.
-cmake_base_command="cmake -S temp/src -B temp/src temp/src/CMakeLists.txt -DCMAKE_BUILD_TYPE=Release -DCMAKE_MODULE_PATH=\"$DOWNLOADED_PACKAGE_FOLDERS\" -DASSIMP_BUILD_ZLIB=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=ON -DASSIMP_HUNTER_ENABLED=OFF -DASSIMP_BUILD_USD_IMPORTER=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DASSIMP_BUILD_TESTS=ON -DCMAKE_CXX_FLAGS=\"-Wno-unused-const-variable -Wno-error\""
+cmake_base_command="cmake -S temp/src -B temp/src temp/src/CMakeLists.txt -DCMAKE_BUILD_TYPE=Release -DCMAKE_MODULE_PATH=\"$DOWNLOADED_PACKAGE_FOLDERS\" -DASSIMP_BUILD_ZLIB=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_HUNTER_ENABLED=OFF -DASSIMP_BUILD_USD_IMPORTER=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DASSIMP_BUILD_TESTS=ON -DCMAKE_CXX_FLAGS=\"-Wno-unused-const-variable -Wno-error\""
 
 # On Mac, load the toolchain file to make sure
 # the build matches compatibility with other Mac libraries

diff --git a/package-system/assimp/build_assimp_windows.cmd b/package-system/assimp/build_assimp_windows.cmd
@@ -9,10 +9,6 @@
 @rem # except the ones we want.  This prevents the cmake build system from automatically finding things
 @rem # if they happen to be installed locally, which we don't want.
 
-@rem Install Window's DirectX as required to build Assimp
-choco install directx -y
-choco install directx-sdk -y
-
 @rem # cmake expects fowardslashes:
 set "DOWNLOADED_PACKAGE_FOLDERS=%DOWNLOADED_PACKAGE_FOLDERS:\=/%"
 
@@ -22,7 +18,7 @@ cmake -S temp/src ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_MODULE_PATH="%DOWNLOADED_PACKAGE_FOLDERS%" ^
     -DASSIMP_BUILD_ZLIB=OFF ^
-    -DASSIMP_BUILD_ASSIMP_TOOLS=ON ^
+    -DASSIMP_BUILD_ASSIMP_TOOLS=OFF ^
     -DASSIMP_BUILD_USD_IMPORTER=ON ^
     -DCMAKE_CXX_FLAGS="/EHsc /w" ^
     temp/src/CMakeLists.txt || exit /b 1
@@ -35,7 +31,7 @@ cmake -S temp/src ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_MODULE_PATH="%DOWNLOADED_PACKAGE_FOLDERS%" ^
     -DASSIMP_BUILD_ZLIB=OFF ^
-    -DASSIMP_BUILD_ASSIMP_TOOLS=ON ^
+    -DASSIMP_BUILD_ASSIMP_TOOLS=OFF ^
     -DASSIMP_BUILD_USD_IMPORTER=ON ^
     -DCMAKE_CXX_FLAGS="/EHsc /w" ^
     temp/src/CMakeLists.txt || exit /b 1

diff --git a/package-system/assimp/docker_build_assimp_linux.sh b/package-system/assimp/docker_build_assimp_linux.sh
@@ -31,7 +31,7 @@ echo "Working with Assimp commit hash ${GIT_HASH}"
 echo "Using custom zlib (shared) library at /data/workspace/${ZLIB_LIB_PATH}"
 
 
-cmake -S . -B /data/workspace/build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_MODULE_PATH="/data/workspace/${ZLIB_LIB_PATH}" -DASSIMP_BUILD_ZLIB=ON -DBUILD_SHARED_LIBS=ON -DASSIMP_BUILD_ASSIMP_TOOLS=ON -DASSIMP_BUILD_USD_IMPORTER=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DCMAKE_CXX_FLAGS="-Wno-sign-compare -Wno-maybe-uninitialized" ${AARCH64_FLAGS} 
+cmake -S . -B /data/workspace/build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_MODULE_PATH="/data/workspace/${ZLIB_LIB_PATH}" -DASSIMP_BUILD_ZLIB=ON -DBUILD_SHARED_LIBS=ON -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_USD_IMPORTER=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DCMAKE_CXX_FLAGS="-Wno-sign-compare -Wno-maybe-uninitialized" ${AARCH64_FLAGS} 
 if [ $? -ne 0 ]
 then
     echo "Failed generating cmake project for assimp/shared."
@@ -49,7 +49,7 @@ fi
 
 echo "Using custom zlib (static) library at /data/workspace/${ZLIB_LIB_PATH}"
 
-cmake -S . -B /data/workspace/build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_MODULE_PATH="/data/workspace/${ZLIB_LIB_PATH}" -DASSIMP_BUILD_ZLIB=ON -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=ON -DASSIMP_BUILD_USD_IMPORTER=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DCMAKE_CXX_FLAGS="-Wno-sign-compare -Wno-maybe-uninitialized" ${AARCH64_FLAGS}
+cmake -S . -B /data/workspace/build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_MODULE_PATH="/data/workspace/${ZLIB_LIB_PATH}" -DASSIMP_BUILD_ZLIB=ON -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_USD_IMPORTER=ON -DASSIMP_WARNINGS_AS_ERRORS=OFF -DCMAKE_CXX_FLAGS="-Wno-sign-compare -Wno-maybe-uninitialized" ${AARCH64_FLAGS}
 if [ $? -ne 0 ]
 then
     echo "Failed generating cmake project for assimp/static."

diff --git a/package-system/assimp/install_assimp_linux.json b/package-system/assimp/install_assimp_linux.json
@@ -3,7 +3,6 @@
   "Install_Paths": [
     "include/",
     "lib/libassimp.a",
-    "bin/assimp",
     "bin/libassimp.so.5.4.3",
     "bin/unit",
     "port/PyAssimp/"

diff --git a/package-system/assimp/install_assimp_mac.json b/package-system/assimp/install_assimp_mac.json
@@ -6,7 +6,6 @@
     "bin/libassimp.5.4.3.dylib",
     "bin/libassimp.5.dylib",
     "bin/libassimp.dylib",
-    "bin/assimp",
     "bin/unit",
     "port/PyAssimp/"
   ]

diff --git a/package-system/assimp/install_assimp_windows.json b/package-system/assimp/install_assimp_windows.json
@@ -5,11 +5,8 @@
     "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-vc143-mt.dll",
     "bin/Release/unit.exe",
-    "bin/Debug/assimpd.exe",
-    "bin/Debug/assimpd.pdb",
     "bin/Debug/assimp-vc143-mtd.dll",
     "bin/Debug/assimp-vc143-mtd.pdb",
     "bin/Debug/unit.exe",