From 4863c924d1db3fbf8bef3963751156340f773527 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 18 Apr 2017 17:15:33 -0700 Subject: [PATCH] don't link or include missing FBX library --- cmake/modules/{FindFBXSDK.cmake => FindFBX.cmake} | 0 libraries/model-baking/CMakeLists.txt | 10 +++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) rename cmake/modules/{FindFBXSDK.cmake => FindFBX.cmake} (100%) diff --git a/cmake/modules/FindFBXSDK.cmake b/cmake/modules/FindFBX.cmake similarity index 100% rename from cmake/modules/FindFBXSDK.cmake rename to cmake/modules/FindFBX.cmake diff --git a/libraries/model-baking/CMakeLists.txt b/libraries/model-baking/CMakeLists.txt index d26874e488..b3698270d7 100644 --- a/libraries/model-baking/CMakeLists.txt +++ b/libraries/model-baking/CMakeLists.txt @@ -4,8 +4,12 @@ setup_hifi_library(Concurrent) link_hifi_libraries(networking image gpu shared ktx) -find_package(FBXSDK) -target_link_libraries(${TARGET_NAME} ${FBX_LIBRARIES}) -target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${FBX_INCLUDE_DIR}) +# try to find the FBX SDK but fail silently if we don't +# because this library is not built by default +find_package(FBX) +if (FBX_FOUND) + target_link_libraries(${TARGET_NAME} ${FBX_LIBRARIES}) + target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${FBX_INCLUDE_DIR}) +endif () set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE)