Minor updates to 3rd party dependency handling (#72)

* assets: allow the plugin manager to look around the FS on non-static builds.

* CMake: disable Magnum libs we don't use right now.

Makes builds slightly faster (50 targets less), also no need to find &
link to these in CMakeLists.

* CMake: make things work with system GLFW but bundled Magnum.

Author: mosra

src/cmake/dependencies.cmake

@@ -75,7 +75,17 @@ if(NOT USE_SYSTEM_MAGNUM)
   set(BUILD_PLUGINS_STATIC ON CACHE BOOL "BUILD_PLUGINS_STATIC" FORCE)
   set(BUILD_STATIC ON CACHE BOOL "BUILD_STATIC" FORCE)
   set(BUILD_STATIC_PIC ON CACHE BOOL "BUILD_STATIC_PIC" FORCE)
-  set(WITH_TRADE ON CACHE BOOL "WITH_TRADE" FORCE)
+
+  # These are enabled by default but we don't need them right now -- disabling
+  # for slightly faster builds. If you need any of these, simply delete a line.
+  set(WITH_INTERCONNECT OFF CACHE BOOL "" FORCE)
+  set(WITH_TESTSUITE OFF CACHE BOOL "" FORCE)
+  set(WITH_DEBUGTOOLS OFF CACHE BOOL "" FORCE)
+  set(WITH_PRIMITIVES OFF CACHE BOOL "" FORCE)
+  set(WITH_TEXT OFF CACHE BOOL "" FORCE)
+  set(WITH_TEXTURETOOLS OFF CACHE BOOL "" FORCE)
+
+  # These are not enabled by default but we need them
   set(WITH_ANYSCENEIMPORTER ON CACHE BOOL "WITH_ANYSCENEIMPORTER" FORCE)
   set(WITH_ASSIMPIMPORTER ON CACHE BOOL "WITH_ASSIMPIMPORTER" FORCE)
   set(WITH_TINYGLTFIMPORTER ON CACHE BOOL "WITH_TINYGLTFIMPORTER" FORCE)
@@ -84,8 +94,11 @@ if(NOT USE_SYSTEM_MAGNUM)
   set(WITH_STBIMAGECONVERTER ON CACHE BOOL "WITH_STBIMAGECONVERTER" FORCE)
   set(WITH_SDL2APPLICATION OFF CACHE BOOL "WITH_SDL2APPLICATION" FORCE)
   set(WITH_EIGEN ON CACHE BOOL "WITH_EIGEN" FORCE)
+
   if(BUILD_GUI_VIEWERS)
-    add_subdirectory("${DEPS_DIR}/glfw")
+    if(NOT USE_SYSTEM_GLFW)
+      add_subdirectory("${DEPS_DIR}/glfw")
+    endif()
     set(WITH_GLFWAPPLICATION ON CACHE BOOL "WITH_GLFWAPPLICATION" FORCE)
   else()
     set(WITH_GLFWAPPLICATION OFF CACHE BOOL "WITH_GLFWAPPLICATION" FORCE)

src/esp/assets/CMakeLists.txt

@@ -4,13 +4,10 @@ find_package(Magnum
   REQUIRED
     AnyImageImporter
     AnySceneImporter
-    DebugTools
     GL
     MeshTools
-    Primitives
     SceneGraph
     Shaders
-    TextureTools
     Trade
 )
 

src/esp/assets/ResourceManager.cpp

@@ -196,8 +196,14 @@ bool ResourceManager::loadGeneralMeshData(const AssetInfo& info,
     return true;
   }
 
-  // load a scene importer plugin (arg is pluginDirectory to silence warnings)
-  Magnum::PluginManager::Manager<Importer> manager("./");
+  // Load a scene importer plugin. In case Magnum is built statically, arg is
+  // pluginDirectory to silence warnings, otherwise we *do* want it to search
+  // in the filesystem.
+  Magnum::PluginManager::Manager<Importer> manager{
+#ifdef MAGNUM_BUILD_STATIC
+      "./"
+#endif
+  };
   std::unique_ptr<Importer> importer =
       manager.loadAndInstantiate("AnySceneImporter");
 

src/esp/gfx/CMakeLists.txt

@@ -16,13 +16,10 @@ find_package(Magnum
   REQUIRED
     AnyImageImporter
     AnySceneImporter
-    DebugTools
     GL
     MeshTools
-    Primitives
     SceneGraph
     Shaders
-    TextureTools
     Trade
 )
 

src/utils/viewer/CMakeLists.txt

@@ -7,13 +7,10 @@ find_package(GLFW REQUIRED)
 
 find_package(Magnum
   REQUIRED
-    DebugTools
     GL
     MeshTools
-    Primitives
     SceneGraph
     Shaders
-    TextureTools
     Trade
     GlfwApplication
 )
@@ -36,10 +33,8 @@ target_link_libraries(viewer
     Magnum::GL
     Magnum::Magnum
     Magnum::MeshTools
-    Magnum::Primitives
     Magnum::SceneGraph
     Magnum::Shaders
-    Magnum::TextureTools
     Magnum::Trade
     # MagnumPlugins::AssimpImporter
     MagnumPlugins::StbImageImporter