Merge branch 'hotfix/fbx' of https://github.com/guillaumeblanc/ozz-an…

…imation into hotfix/fbx
guillaumeblanc · Nov 24, 2023 · 773ca61 · 773ca61
2 parents 74e8b3f + 085835f
commit 773ca61
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,9 +1,15 @@
+Release version 0.14.3
+----------------------
+
+* Build pipeline
+  - Adds vs2022 compiler support for fbxsdk (#170)
+
 Release version 0.14.2
 ----------------------
 
 * Library
   - Transitions away from sprintf to the more secure snprintf.
-  - #147 Works around gcc 11 error stringop-overflow which emits false positives for ozz math serialisation.
+  - #147 Works around gcc 11 error stringop-overflow which emits false positives for ozz math serialization.
 
 * Build pipeline
   - Updates CI compiler versions.

diff --git a/build-utils/cmake/modules/FindFbx.cmake b/build-utils/cmake/modules/FindFbx.cmake
@@ -67,7 +67,9 @@ function(FindFbxLibrariesGeneric _FBX_ROOT_DIR _OUT_FBX_LIBRARIES _OUT_FBX_LIBRA
   # Figures out matching compiler/os directory.
 
   if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
-    if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.20)
+    if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.30)
+      set(FBX_CP_PATH "vs2022")
+    elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.20)
       set(FBX_CP_PATH "vs2019")
     elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10)
       set(FBX_CP_PATH "vs2017")