dqn
/
FBX2glTF
mirror of https://github.com/facebookincubator/FBX2glTF.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Accept multiple SDK versions as valid.

This commit is contained in:
Par Winzell 2018-09-13 12:30:06 -07:00
parent 891cf668b9
commit b475fbead4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -14,14 +14,19 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
include(ExternalProject) include(ExternalProject)
# FBX # 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) if (NOT FBXSDK_FOUND)
message(FATAL_ERROR message(FATAL_ERROR
"Can't find FBX SDK in either:\n" "Can't find FBX SDK in either:\n"
" - Mac OS X: ${FBXSDK_APPLE_ROOT}\n" " - Mac OS X: ${FBXSDK_APPLE_ROOT}\n"
" - Windows: ${FBXSDK_WINDOWS_ROOT}\n" " - Windows: ${FBXSDK_WINDOWS_ROOT}\n"
" - Linux: ${FBXSDK_LINUX_ROOT}" " - Linux: ${FBXSDK_LINUX_ROOT}"
) )
endif() endif()
# DRACO # DRACO

4
FindFBX.cmake
View File

@ -21,7 +21,9 @@ else()
set(ARCH_32 OFF) set(ARCH_32 OFF)
endif() 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") set(_fbxsdk_vstudio_version "vs2015")