瀏覽代碼

Accept multiple SDK versions as valid.

Par Winzell 7 年之前
父節點
當前提交
b475fbead4
共有 2 個文件被更改,包括 10 次插入3 次删除
  1. 7 2
      CMakeLists.txt
  2. 3 1
      FindFBX.cmake

+ 7 - 2
CMakeLists.txt

@@ -14,14 +14,19 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 include(ExternalProject)
 
 # FBX
-find_package(FBX REQUIRED)
+foreach (FBXSDK_VERSION "2019.0" "2018.1.1")
+  find_package(FBX)
+  if (FBXSDK_FOUND)
+    break()
+  endif()
+endforeach(FBXSDK_VERSION)
 if (NOT FBXSDK_FOUND)
   message(FATAL_ERROR
     "Can't find FBX SDK in either:\n"
     " - Mac OS X: ${FBXSDK_APPLE_ROOT}\n"
     " - Windows: ${FBXSDK_WINDOWS_ROOT}\n"
     " - Linux: ${FBXSDK_LINUX_ROOT}"
-)
+  )
 endif()
 
 # DRACO

+ 3 - 1
FindFBX.cmake

@@ -21,7 +21,9 @@ else()
   set(ARCH_32 OFF)
 endif()
 
-set(FBXSDK_VERSION "2018.1.1" CACHE STRING "Precise version string of FBX SDK to use.")
+if (NOT DEFINED FBXSDK_VERSION)
+  set(FBXSDK_VERSION "2018.1.1")
+endif()
 
 set(_fbxsdk_vstudio_version "vs2015")