sceneconverter: move its source to the SceneTools library.

Because that's where it was meant to belong since the beginning.

CMakeLists.txt

@@ -113,7 +113,7 @@ cmake_dependent_option(WITH_AUDIO "Build Audio library" OFF "NOT WITH_AL_INFO;NO
 option(WITH_DEBUGTOOLS "Build DebugTools library" ON)
 cmake_dependent_option(WITH_MESHTOOLS "Build MeshTools library" ON "NOT WITH_OBJIMPORTER;NOT WITH_SCENECONVERTER" ON)
 option(WITH_SCENEGRAPH "Build SceneGraph library" ON)
-option(WITH_SCENETOOLS "Build SceneTools library" ON)
+cmake_dependent_option(WITH_SCENETOOLS "Build SceneTools library" ON "NOT WITH_SCENECONVERTER" ON)
 option(WITH_SHADERS "Build Shaders library" ON)
 cmake_dependent_option(WITH_SHADERTOOLS "Build ShaderTools library" ON "NOT WITH_SHADERCONVERTER" ON)
 cmake_dependent_option(WITH_TEXT "Build Text library" ON "NOT WITH_FONTCONVERTER;NOT WITH_MAGNUMFONT;NOT WITH_MAGNUMFONTCONVERTER" ON)

doc/Doxyfile

@@ -925,8 +925,8 @@ 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/SceneTools/sceneconverter.cpp \
                          ../src/Magnum/ShaderTools/shaderconverter.cpp \
                          ../src/Magnum/Text/fontconverter.cpp \
                          ../src/Magnum/TextureTools/distancefieldconverter.cpp \

doc/building.dox

@@ -635,7 +635,7 @@ There are also a few command-line utilities, also all disabled by default:
     building of the @ref Trade library.
 -   `WITH_SCENECONVERTER` --- Build the @ref magnum-sceneconverter "magnum-sceneconverter"
     executable for converting scenes of different formats. Enables also
-    building of the @ref MeshTools library.
+    building of the @ref MeshTools and @ref SceneTools library.
 -   `WITH_SHADERCONVERTER` --- Build the @ref magnum-shaderconverter "magnum-shaderconverter"
     executable for converting scenes of different formats. Enables also
     building of the @ref ShaderTools library.

doc/changelog.dox

@@ -334,16 +334,6 @@ See also:
     zero-fill while @ref Math::Matrix stays with the identity for consistency
     with other constructors.
 
-@subsubsection changelog-latest-changes-meshtools MeshTools library
-
--   Added a `--bounds` option to @ref magnum-sceneconverter "magnum-sceneconverter",
-    showing data ranges of known attributes
--   @ref magnum-sceneconverter "magnum-sceneconverter" now has separate
-    `--info-animations`, `--info-images`, `--info-lights`, `--info-materials`,
-    `--info-meshes`, `--info-skins` and `--info-textures` for printing
-    information just about particular data type, with `--info` being a shortcut
-    for all specified together
-
 @subsubsection changelog-latest-changes-platform Platform libraries
 
 -   Added a @ref Platform::GlfwApplication::setWindowIcon() overload taking a
@@ -380,6 +370,16 @@ See also:
     @ref SceneGraph::Object::parent() links up to the root as well as
     @ref SceneGraph::AbstractFeature::object() references
 
+@subsubsection changelog-latest-changes-scenetools SceneTools library
+
+-   Added a `--bounds` option to @ref magnum-sceneconverter "magnum-sceneconverter",
+    showing data ranges of known attributes
+-   @ref magnum-sceneconverter "magnum-sceneconverter" now has separate
+    `--info-animations`, `--info-images`, `--info-lights`, `--info-materials`,
+    `--info-meshes`, `--info-skins` and `--info-textures` for printing
+    information just about particular data type, with `--info` being a shortcut
+    for all specified together
+
 @subsubsection changelog-latest-changes-shaders Shaders library
 
 -   In the original implementation of normal mapping in @ref Shaders::PhongGL,

src/Magnum/MeshTools/CMakeLists.txt

@@ -121,20 +121,6 @@ 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
-        MagnumMeshTools
-        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}

src/Magnum/SceneTools/CMakeLists.txt

@@ -49,6 +49,20 @@ install(TARGETS MagnumSceneTools
     ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
 install(FILES ${MagnumSceneTools_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/SceneTools)
 
+if(WITH_SCENECONVERTER)
+    add_executable(magnum-sceneconverter sceneconverter.cpp)
+    target_link_libraries(magnum-sceneconverter PRIVATE
+        Magnum
+        MagnumMeshTools
+        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(MagnumSceneToolsTestLib INTERFACE )