From 5982b2b0dd5af0afad45efd4aaadf44c6e130b0c Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Mon, 3 Dec 2018 22:15:42 -0800 Subject: [PATCH 1/5] 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") From eca9ed838265d04a8f0ef236b4844749a6b3fda6 Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Tue, 4 Dec 2018 08:56:05 -0800 Subject: [PATCH 2/5] Do the right thing with ICONV. Needed for Mac now. --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30d4b58..04249be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,7 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) find_package(Threads REQUIRED) find_package(LibXml2 REQUIRED) find_package(ZLIB REQUIRED) +find_package(iConv REQUIRED) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") include(ExternalProject) @@ -228,6 +229,7 @@ if (NOT MSVC) endif() target_link_libraries(libFBX2glTF + Iconv::Iconv ${FRAMEWORKS} ${DRACO_LIB} ${FMT_LIB} @@ -243,6 +245,7 @@ target_include_directories(libFBX2glTF PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src ) target_include_directories(libFBX2glTF SYSTEM PUBLIC + Iconv::Iconv ${FBXSDK_INCLUDE_DIR} ${DRACO_INCLUDE_DIR} ${MATHFU_INCLUDE_DIRS} @@ -251,6 +254,8 @@ target_include_directories(libFBX2glTF SYSTEM PUBLIC ${STB_INCLUDE_DIR} ${CPPCODEC_INCLUDE_DIR} ${FMT_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} ) target_include_directories(appFBX2glTF PUBLIC From d7fca1614c4e7b4b13ba0573d533914c14567ea0 Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Tue, 4 Dec 2018 09:29:39 -0800 Subject: [PATCH 3/5] Don't require iConv; it can be builtin. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 04249be..590b7d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) find_package(Threads REQUIRED) find_package(LibXml2 REQUIRED) find_package(ZLIB REQUIRED) -find_package(iConv REQUIRED) +find_package(iConv) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") include(ExternalProject) From 7efe3a1655321eb14a4a3772165c006a4e7cba90 Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Tue, 4 Dec 2018 09:54:08 -0800 Subject: [PATCH 4/5] Better iconv handling. Jeez, CMake... --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 590b7d3..8219ab4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) find_package(Threads REQUIRED) find_package(LibXml2 REQUIRED) find_package(ZLIB REQUIRED) -find_package(iConv) +find_package(Iconv QUIET) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") include(ExternalProject) @@ -229,7 +229,6 @@ if (NOT MSVC) endif() target_link_libraries(libFBX2glTF - Iconv::Iconv ${FRAMEWORKS} ${DRACO_LIB} ${FMT_LIB} @@ -258,6 +257,11 @@ target_include_directories(libFBX2glTF SYSTEM PUBLIC ${ZLIB_INCLUDE_DIRS} ) +if (Iconv::Iconv) + target_link_libraries(libFBX2glTF Iconv::Iconv) + target_include_directories(libFBX2glTF SYSTEM PUBLIC Iconv::Iconv) +endif() + target_include_directories(appFBX2glTF PUBLIC ${CXXOPTS_INCLUDE_DIR} ) From 1f54ec03c118b82e80e5ce22393e6b2a1538c8cd Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Tue, 4 Dec 2018 10:01:07 -0800 Subject: [PATCH 5/5] I'm going to stab someone. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8219ab4..4afb914 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,7 +257,7 @@ target_include_directories(libFBX2glTF SYSTEM PUBLIC ${ZLIB_INCLUDE_DIRS} ) -if (Iconv::Iconv) +if (Iconv_FOUND) target_link_libraries(libFBX2glTF Iconv::Iconv) target_include_directories(libFBX2glTF SYSTEM PUBLIC Iconv::Iconv) endif()