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

Look for the FBX SDK where we know it is.

This commit is contained in:
Par Winzell 2019-04-30 14:49:21 -07:00
parent 7fc7120487
commit 6c7b3a7fb3
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -17,12 +17,6 @@ set(CMAKE_CXX_STANDARD 11)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
include(ExternalProject) 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 # FBX
foreach (FBXSDK_VERSION "2019.2") foreach (FBXSDK_VERSION "2019.2")
find_package(FBX) find_package(FBX)
@ -39,6 +33,12 @@ if (NOT FBXSDK_FOUND)
) )
endif() 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) set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(Iconv QUIET) find_package(Iconv QUIET)

23
FindFBX.cmake
View File

@ -24,28 +24,23 @@ else()
endif() endif()
if (NOT DEFINED FBXSDK_VERSION) if (NOT DEFINED FBXSDK_VERSION)
set(FBXSDK_VERSION "2018.1.1") set(FBXSDK_VERSION "2019.2")
endif() endif()
set(_fbxsdk_vstudio_version "vs2017") set(_fbxsdk_vstudio_version "vs2017")
message("Looking for FBX SDK version: ${FBXSDK_VERSION}") message("Looking for FBX SDK version: ${FBXSDK_VERSION}")
if (DEFINED FBXSDK_SDKS) if (NOT DEFINED FBXSDK_SDKS)
get_filename_component(FBXSDK_SDKS_ABS ${FBXSDK_SDKS} ABSOLUTE) set(FBXSDK_SDKS "${CMAKE_CURRENT_SOURCE_DIR}/sdk")
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}")
endif() 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) if (APPLE)
set(_fbxsdk_root "${FBXSDK_APPLE_ROOT}") set(_fbxsdk_root "${FBXSDK_APPLE_ROOT}")
set(_fbxsdk_libdir_debug "lib/clang/debug") set(_fbxsdk_libdir_debug "lib/clang/debug")