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

Require 2019.2 henceforth.

This commit is contained in:
Par Winzell 2018-12-03 22:15:42 -08:00 committed by Pär Winzell
parent fe2aa11516
commit e990432ecf
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -8,13 +8,17 @@ if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
endif () endif ()
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(ZLIB REQUIRED)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
include(ExternalProject) include(ExternalProject)
# FBX # FBX
foreach (FBXSDK_VERSION "2019.0" "2018.1.1") foreach (FBXSDK_VERSION "2019.2")
find_package(FBX) find_package(FBX)
if (FBXSDK_FOUND) if (FBXSDK_FOUND)
break() break()
@ -230,6 +234,8 @@ target_link_libraries(libFBX2glTF
optimized ${FBXSDK_LIBRARY} optimized ${FBXSDK_LIBRARY}
debug ${FBXSDK_LIBRARY_DEBUG} debug ${FBXSDK_LIBRARY_DEBUG}
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
${LIBXML2_LIBRARIES}
${ZLIB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
) )

8
FindFBX.cmake
View File

@ -66,11 +66,11 @@ elseif (WIN32)
elseif (UNIX) elseif (UNIX)
set(_fbxsdk_root "${FBXSDK_LINUX_ROOT}") set(_fbxsdk_root "${FBXSDK_LINUX_ROOT}")
if (ARCH_32) if (ARCH_32)
set(_fbxsdk_libdir_debug "lib/gcc4/x86/debug") set(_fbxsdk_libdir_debug "lib/gcc/x86/debug")
set(_fbxsdk_libdir_release "lib/gcc4/x86/release") set(_fbxsdk_libdir_release "lib/gcc/x86/release")
else() else()
set(_fbxsdk_libdir_debug "lib/gcc4/x64/debug") set(_fbxsdk_libdir_debug "lib/gcc/x64/debug")
set(_fbxsdk_libdir_release "lib/gcc4/x64/release") set(_fbxsdk_libdir_release "lib/gcc/x64/release")
endif() endif()
set(_fbxsdk_libname_debug "libfbxsdk.a") set(_fbxsdk_libname_debug "libfbxsdk.a")
set(_fbxsdk_libname_release "libfbxsdk.a") set(_fbxsdk_libname_release "libfbxsdk.a")