Merge pull request #92 from aws-lumberyard-dev/assimp_mac_minos_update

Set min OS version for assimp on mac to use the shared mac settings

package-system/assimp/build_assimp_unix_like.sh

@@ -6,19 +6,34 @@
 #
 #
 
-cmake -S temp/src -B temp/build \
-    -DBUILD_SHARED_LIBS=OFF \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_MODULE_PATH="$DOWNLOADED_PACKAGE_FOLDERS" \
-    -DASSIMP_BUILD_ZLIB=OFF \
-    temp/src/CMakeLists.txt || exit 1
+cmake_base_command="cmake -S temp/src -B temp/build  -DCMAKE_BUILD_TYPE=Release -DCMAKE_MODULE_PATH=\"$DOWNLOADED_PACKAGE_FOLDERS\" -DASSIMP_BUILD_ZLIB=OFF"
+
+# On Mac, load the toolchain file to make sure
+# the build matches compatibility with other Mac libraries
+if [ "$(uname)" == "Darwin" ];
+then
+    echo "Loading Darwin toolchain file"
+    cmake_base_command+=" -DCMAKE_TOOLCHAIN_FILE=$PWD/../../Scripts/cmake/Platform/Mac/Toolchain_mac.cmake"
+fi
+
+cmake_no_shared_libs="$cmake_base_command -DBUILD_SHARED_LIBS=OFF"
+cmake_shared_libs="$cmake_base_command -DBUILD_SHARED_LIBS=ON"
+
+echo "Running first cmake command:"
+echo "$cmake_no_shared_libs"
+
+eval "$cmake_no_shared_libs temp/src/CMakeLists.txt" || exit 1
 cmake --build temp/src --config release || exit 1
 
-cmake -S temp/src -B temp/build \
-    -DBUILD_SHARED_LIBS=ON \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_MODULE_PATH="$DOWNLOADED_PACKAGE_FOLDERS" \
-    -DASSIMP_BUILD_ZLIB=OFF \
-    temp/src/CMakeLists.txt || exit 1
+echo "Running second cmake command:"
+echo "$cmake_shared_libs"
+
+eval "$cmake_shared_libs temp/src/CMakeLists.txt" || exit 1
 cmake --build temp/src --config release || exit 1
 
+if [ "$(uname)" == "Darwin" ];
+then
+    # Printing the minimum OS version here can save some time debugging.
+    echo "Min OS version:"
+    otool -l temp/src/bin/assimp | grep -i minos
+fi

package-system/assimp/build_config.json

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

package_build_list_host_darwin.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-mac":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Mac --package-root ../../package-system --clean",
+        "assimp-5.1.6-rev2-mac":  "Scripts/extras/pull_and_build_from_git.py ../../package-system/assimp --platform-name Mac --package-root ../../package-system --clean",
         "AWSNativeSDK-1.9.50-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Mac --package-root ../../package-system --clean",
         "AWSNativeSDK-1.9.50-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name iOS --package-root ../../package-system --clean",
         "Lua-5.4.4-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Mac --package-root ../../package-system/Lua/temp --clean",
@@ -52,7 +52,7 @@
         "expat-2.4.2-rev1-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name iOS --package-root ../../package-system/expat/temp --clean"
     },
     "build_from_folder": {
-        "assimp-5.1.6-rev1-mac": "package-system/assimp-mac",
+        "assimp-5.1.6-rev2-mac": "package-system/assimp-mac",
         "AWSNativeSDK-1.9.50-rev1-mac": "package-system/AWSNativeSDK-mac",
         "AWSNativeSDK-1.9.50-rev1-ios": "package-system/AWSNativeSDK-ios",
         "AwsIotDeviceSdkCpp-1.15.2-rev2-mac": "package-system/AwsIotDeviceSdkCpp-mac",