From b475fbead4fb966aaf60cde55ac556c646da0d72 Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Thu, 13 Sep 2018 12:30:06 -0700 Subject: [PATCH] Accept multiple SDK versions as valid. --- CMakeLists.txt | 9 +++++++-- FindFBX.cmake | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09b67f1..8d40435 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/FindFBX.cmake b/FindFBX.cmake index 4244631..b187427 100644 --- a/FindFBX.cmake +++ b/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")