From e990432ecfbe243f817e65c6ddf16ced40d00381 Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Mon, 3 Dec 2018 22:15:42 -0800 Subject: [PATCH] Require 2019.2 henceforth. --- CMakeLists.txt | 8 +++++++- FindFBX.cmake | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 717fe36..30d4b58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,13 +8,17 @@ if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") endif () set(CMAKE_CXX_STANDARD 11) + +set(CMAKE_THREAD_PREFER_PTHREAD TRUE) find_package(Threads REQUIRED) +find_package(LibXml2 REQUIRED) +find_package(ZLIB REQUIRED) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") include(ExternalProject) # FBX -foreach (FBXSDK_VERSION "2019.0" "2018.1.1") +foreach (FBXSDK_VERSION "2019.2") find_package(FBX) if (FBXSDK_FOUND) break() @@ -230,6 +234,8 @@ target_link_libraries(libFBX2glTF optimized ${FBXSDK_LIBRARY} debug ${FBXSDK_LIBRARY_DEBUG} ${CMAKE_DL_LIBS} + ${LIBXML2_LIBRARIES} + ${ZLIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/FindFBX.cmake b/FindFBX.cmake index 65f13e2..825a233 100644 --- a/FindFBX.cmake +++ b/FindFBX.cmake @@ -66,11 +66,11 @@ elseif (WIN32) elseif (UNIX) set(_fbxsdk_root "${FBXSDK_LINUX_ROOT}") if (ARCH_32) - set(_fbxsdk_libdir_debug "lib/gcc4/x86/debug") - set(_fbxsdk_libdir_release "lib/gcc4/x86/release") + set(_fbxsdk_libdir_debug "lib/gcc/x86/debug") + set(_fbxsdk_libdir_release "lib/gcc/x86/release") else() - set(_fbxsdk_libdir_debug "lib/gcc4/x64/debug") - set(_fbxsdk_libdir_release "lib/gcc4/x64/release") + set(_fbxsdk_libdir_debug "lib/gcc/x64/debug") + set(_fbxsdk_libdir_release "lib/gcc/x64/release") endif() set(_fbxsdk_libname_debug "libfbxsdk.a") set(_fbxsdk_libname_release "libfbxsdk.a")