Browse Source

sceneconverter: move the utility from Trade to MeshTools.

So it can make use of all the APIs in here. Having the utility part of
Trade would make the cyclic dependency a bit weird. Not adding MeshTools
as a dependency just yet, will do that once it's actually needed.
pull/441/head
Vladimír Vondruš 6 years ago
parent
commit
b7edd8df25
  1. 2
      Doxyfile
  2. 13
      src/Magnum/MeshTools/CMakeLists.txt
  3. 0
      src/Magnum/MeshTools/sceneconverter.cpp
  4. 13
      src/Magnum/Trade/CMakeLists.txt

2
Doxyfile

@ -917,11 +917,11 @@ WARN_LOGFILE =
INPUT = src/Magnum \
src/MagnumPlugins \
src/Magnum/Audio/al-info.cpp \
src/Magnum/MeshTools/sceneconverter.cpp \
src/Magnum/Platform/gl-info.cpp \
src/Magnum/Text/fontconverter.cpp \
src/Magnum/TextureTools/distancefieldconverter.cpp \
src/Magnum/Trade/imageconverter.cpp \
src/Magnum/Trade/sceneconverter.cpp \
doc/ \
../magnum-plugins/src/Magnum \
../magnum-plugins/src/MagnumPlugins \

13
src/Magnum/MeshTools/CMakeLists.txt

@ -119,6 +119,19 @@ install(TARGETS MagnumMeshTools
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
install(FILES ${MagnumMeshTools_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/MeshTools)
if(WITH_SCENECONVERTER)
add_executable(magnum-sceneconverter sceneconverter.cpp)
target_link_libraries(magnum-sceneconverter PRIVATE
Magnum
MagnumTrade)
set_target_properties(magnum-sceneconverter PROPERTIES FOLDER "Magnum/MeshTools")
install(TARGETS magnum-sceneconverter DESTINATION ${MAGNUM_BINARY_INSTALL_DIR})
# Magnum sceneconverter target alias for superprojects
add_executable(Magnum::sceneconverter ALIAS magnum-sceneconverter)
endif()
if(BUILD_TESTS)
# Library with graceful assert for testing
add_library(MagnumMeshToolsTestLib ${SHARED_OR_STATIC}

0
src/Magnum/Trade/sceneconverter.cpp → src/Magnum/MeshTools/sceneconverter.cpp

13
src/Magnum/Trade/CMakeLists.txt

@ -149,19 +149,6 @@ if(WITH_IMAGECONVERTER)
add_executable(Magnum::imageconverter ALIAS magnum-imageconverter)
endif()
if(WITH_SCENECONVERTER)
add_executable(magnum-sceneconverter sceneconverter.cpp)
target_link_libraries(magnum-sceneconverter PRIVATE
Magnum
MagnumTrade)
set_target_properties(magnum-sceneconverter PROPERTIES FOLDER "Magnum/Trade")
install(TARGETS magnum-sceneconverter DESTINATION ${MAGNUM_BINARY_INSTALL_DIR})
# Magnum sceneconverter target alias for superprojects
add_executable(Magnum::sceneconverter ALIAS magnum-sceneconverter)
endif()
if(BUILD_TESTS)
# Library with graceful assert for testing
add_library(MagnumTradeTestLib ${SHARED_OR_STATIC}

Loading…
Cancel
Save