diff --git a/Doxyfile b/Doxyfile index 0045454a6..d8271cb9e 100644 --- a/Doxyfile +++ b/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 \ diff --git a/src/Magnum/MeshTools/CMakeLists.txt b/src/Magnum/MeshTools/CMakeLists.txt index 8efc3394b..5fbbbf138 100644 --- a/src/Magnum/MeshTools/CMakeLists.txt +++ b/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} diff --git a/src/Magnum/Trade/sceneconverter.cpp b/src/Magnum/MeshTools/sceneconverter.cpp similarity index 100% rename from src/Magnum/Trade/sceneconverter.cpp rename to src/Magnum/MeshTools/sceneconverter.cpp diff --git a/src/Magnum/Trade/CMakeLists.txt b/src/Magnum/Trade/CMakeLists.txt index e41287968..698ac1e35 100644 --- a/src/Magnum/Trade/CMakeLists.txt +++ b/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}