mirror of
https://github.com/minetest/irrlicht.git
synced 2025-02-22 22:00:26 +01:00
Export tinygltf target
This commit is contained in:
parent
36a90e9973
commit
a3b2dbdebb
@ -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:./>"
|
||||||
)
|
)
|
||||||
|
@ -356,11 +356,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
|
||||||
@ -547,6 +542,7 @@ target_link_libraries(IrrlichtMt PRIVATE
|
|||||||
${ZLIB_LIBRARY}
|
${ZLIB_LIBRARY}
|
||||||
${JPEG_LIBRARY}
|
${JPEG_LIBRARY}
|
||||||
${PNG_LIBRARY}
|
${PNG_LIBRARY}
|
||||||
|
tinygltf::tinygltf
|
||||||
"$<$<BOOL:${USE_SDL2}>:SDL2::SDL2>"
|
"$<$<BOOL:${USE_SDL2}>:SDL2::SDL2>"
|
||||||
|
|
||||||
"$<$<BOOL:${OPENGL_DIRECT_LINK}>:${OPENGL_LIBRARIES}>"
|
"$<$<BOOL:${OPENGL_DIRECT_LINK}>:${OPENGL_LIBRARIES}>"
|
||||||
@ -579,7 +575,13 @@ if(WIN32)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Installation of library
|
# Installation of library
|
||||||
install(TARGETS IrrlichtMt
|
if(ANDROID)
|
||||||
|
set(INSTALL_TARGETS IrrlichtMt tinygltf native_app_glue)
|
||||||
|
else()
|
||||||
|
set(INSTALL_TARGETS IrrlichtMt tinygltf)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
install(TARGETS ${INSTALL_TARGETS}
|
||||||
EXPORT IrrlichtMt-export
|
EXPORT IrrlichtMt-export
|
||||||
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user