minetest
/
irrlicht
mirror of https://github.com/minetest/irrlicht.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Export tinygltf target

This commit is contained in:
JosiahWI 2022-10-16 18:15:16 -05:00
parent f8a91087e6
commit 15e589810b
No known key found for this signature in database
GPG Key ID: C7BB8573A4ABC4B9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/Irrlicht/CMakeLists.txt
View File

@ -171,11 +171,6 @@ add_library(IRRMESHOBJ OBJECT
${IRRMESHLOADER} ${IRRMESHLOADER}
) )
target_link_libraries(IRRMESHOBJ
PRIVATE
tinygltf::tinygltf
)
add_library(IRROBJ OBJECT add_library(IRROBJ OBJECT
CBillboardSceneNode.cpp CBillboardSceneNode.cpp
CCameraSceneNode.cpp CCameraSceneNode.cpp
@ -306,7 +301,11 @@ target_include_directories(IrrlichtMt
${link_includes} ${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 # Propagate static library flag to lib users, only needed for Windows
if(NOT BUILD_SHARED_LIBS) if(NOT BUILD_SHARED_LIBS)
@ -325,7 +324,7 @@ endif()
if(ANDROID) if(ANDROID)
set(INSTALL_TARGETS IrrlichtMt native_app_glue) set(INSTALL_TARGETS IrrlichtMt native_app_glue)
else() else()
set(INSTALL_TARGETS IrrlichtMt) set(INSTALL_TARGETS IrrlichtMt tinygltf)
endif() endif()
install(TARGETS ${INSTALL_TARGETS} install(TARGETS ${INSTALL_TARGETS}

3
source/lib/tinygltf/CMakeLists.txt
View File

@ -18,5 +18,6 @@ target_compile_definitions(tinygltf
target_include_directories(tinygltf target_include_directories(tinygltf
INTERFACE INTERFACE
"${CMAKE_CURRENT_SOURCE_DIR}" "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
"$<INSTALL_INTERFACE:./>"
) )