From 15e589810b881b1616e69bc32e8b54edef0aa7c2 Mon Sep 17 00:00:00 2001 From: JosiahWI Date: Sun, 16 Oct 2022 18:15:16 -0500 Subject: [PATCH] Export tinygltf target --- source/Irrlicht/CMakeLists.txt | 13 ++++++------- source/lib/tinygltf/CMakeLists.txt | 3 ++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt index aacf0dae..d0c04d52 100644 --- a/source/Irrlicht/CMakeLists.txt +++ b/source/Irrlicht/CMakeLists.txt @@ -171,11 +171,6 @@ add_library(IRRMESHOBJ OBJECT ${IRRMESHLOADER} ) -target_link_libraries(IRRMESHOBJ - PRIVATE - tinygltf::tinygltf -) - add_library(IRROBJ OBJECT CBillboardSceneNode.cpp CCameraSceneNode.cpp @@ -306,7 +301,11 @@ target_include_directories(IrrlichtMt ${link_includes} ) -target_link_libraries(IrrlichtMt PRIVATE ${link_libs}) +target_link_libraries(IrrlichtMt + PRIVATE + tinygltf::tinygltf + ${link_libs} +) # Propagate static library flag to lib users, only needed for Windows if(NOT BUILD_SHARED_LIBS) @@ -325,7 +324,7 @@ endif() if(ANDROID) set(INSTALL_TARGETS IrrlichtMt native_app_glue) else() - set(INSTALL_TARGETS IrrlichtMt) + set(INSTALL_TARGETS IrrlichtMt tinygltf) endif() install(TARGETS ${INSTALL_TARGETS} diff --git a/source/lib/tinygltf/CMakeLists.txt b/source/lib/tinygltf/CMakeLists.txt index 00d3b3b7..7f86233b 100644 --- a/source/lib/tinygltf/CMakeLists.txt +++ b/source/lib/tinygltf/CMakeLists.txt @@ -18,5 +18,6 @@ target_compile_definitions(tinygltf target_include_directories(tinygltf INTERFACE - "${CMAKE_CURRENT_SOURCE_DIR}" + "$" + "$" )