From 6c7b3a7fb31249490f616d33d7b707584e924333 Mon Sep 17 00:00:00 2001
From: Par Winzell <zell@fb.com>
Date: Tue, 30 Apr 2019 14:49:21 -0700
Subject: [PATCH] Look for the FBX SDK where we know it is.

---
 CMakeLists.txt | 12 ++++++------
 FindFBX.cmake  | 23 +++++++++--------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1092208..c5ffeb8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,12 +17,6 @@ set(CMAKE_CXX_STANDARD 11)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 include(ExternalProject)
 
-if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan_paths.cmake")
-  message(FATAL_ERROR
-    "The Conan package manager must run ('install') first. ${typical_usage_str}")
-endif()
-include("${CMAKE_BINARY_DIR}/conan_paths.cmake")
-
 # FBX
 foreach (FBXSDK_VERSION "2019.2")
   find_package(FBX)
@@ -39,6 +33,12 @@ if (NOT FBXSDK_FOUND)
   )
 endif()
 
+if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan_paths.cmake")
+  message(FATAL_ERROR
+    "The Conan package manager must run ('install') first. ${typical_usage_str}")
+endif()
+include("${CMAKE_BINARY_DIR}/conan_paths.cmake")
+
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 find_package(Threads REQUIRED)
 find_package(Iconv QUIET)
diff --git a/FindFBX.cmake b/FindFBX.cmake
index fdf904d..0c29dc1 100644
--- a/FindFBX.cmake
+++ b/FindFBX.cmake
@@ -24,28 +24,23 @@ else()
 endif()
 
 if (NOT DEFINED FBXSDK_VERSION)
-  set(FBXSDK_VERSION "2018.1.1")
+  set(FBXSDK_VERSION "2019.2")
 endif()
 
 set(_fbxsdk_vstudio_version "vs2017")
 
 message("Looking for FBX SDK version: ${FBXSDK_VERSION}")
 
-if (DEFINED FBXSDK_SDKS)
-  get_filename_component(FBXSDK_SDKS_ABS ${FBXSDK_SDKS} ABSOLUTE)
-
-  set(FBXSDK_APPLE_ROOT   "${FBXSDK_SDKS_ABS}/Darwin/${FBXSDK_VERSION}")
-  set(FBXSDK_LINUX_ROOT   "${FBXSDK_SDKS_ABS}/Linux/${FBXSDK_VERSION}")
-  set(FBXSDK_WINDOWS_ROOT "${FBXSDK_SDKS_ABS}/Windows/${FBXSDK_VERSION}")
-else()
-  set(FBXSDK_APPLE_ROOT
-    "/Applications/Autodesk/FBX SDK/${FBXSDK_VERSION}")
-  set(FBXSDK_LINUX_ROOT
-    "/usr")
-  set(FBXSDK_WINDOWS_ROOT
-    "C:/Program Files/Autodesk/FBX/FBX SDK/${FBXSDK_VERSION}")
+if (NOT DEFINED FBXSDK_SDKS)
+   set(FBXSDK_SDKS "${CMAKE_CURRENT_SOURCE_DIR}/sdk")
 endif()
 
+get_filename_component(FBXSDK_SDKS_ABS ${FBXSDK_SDKS} ABSOLUTE)
+
+set(FBXSDK_APPLE_ROOT   "${FBXSDK_SDKS_ABS}/Darwin/${FBXSDK_VERSION}")
+set(FBXSDK_LINUX_ROOT   "${FBXSDK_SDKS_ABS}/Linux/${FBXSDK_VERSION}")
+set(FBXSDK_WINDOWS_ROOT "${FBXSDK_SDKS_ABS}/Windows/${FBXSDK_VERSION}")
+
 if (APPLE)
   set(_fbxsdk_root "${FBXSDK_APPLE_ROOT}")
   set(_fbxsdk_libdir_debug "lib/clang/debug")