amf: Don't load(assimp) id conan is availab le

CELLINKAB · May 22, 2024 · b8bbf1d · b8bbf1d
1 parent 712f6f7
commit b8bbf1d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/plugins/geometryloaders/amf/amf.pro b/src/plugins/geometryloaders/amf/amf.pro
@@ -1,6 +1,5 @@
 TARGET = amfgeometryloader
 QT += core-private 3dcore 3dcore-private 3drender 3drender-private
-CONFIG += assimp
 
 INCLUDEPATH += \
     $$MOC_DIR
@@ -17,17 +16,17 @@ SOURCES += \
 DISTFILES += \
     amf.json
 
-exists($$BUILD_TREE/conanbuildinfo.pri): include($$BUILD_TREE/conanbuildinfo.pri)
-else: error("Need assimp included via conan in the top level project")
-
 PLUGIN_TYPE = geometryloaders
 PLUGIN_CLASS_NAME = AmfGeometryLoaderPlugin
 
-load(assimp)
 load(qt_build_config)
 load(qt_plugin)
 
 exists($$BUILD_TREE/conanbuildinfo.pri) {
     CONFIG += conan_basic_setup
     include($$BUILD_TREE/conanbuildinfo.pri)
+} else {
+    CONFIG += assimp
+    warning("Need assimp included via conan in the top level project, attempting to sideload")
+    load(assimp)
 }
diff --git a/src/plugins/geometryloaders/amf/amfgeometryloader.h b/src/plugins/geometryloaders/amf/amfgeometryloader.h
@@ -26,6 +26,7 @@
 
 class AmfGeometryLoader : public Qt3DRender::BaseGeometryLoader
 {
+    Q_OBJECT
 protected:
     bool doLoad(QIODevice* ioDev, const QString& subMesh) final;
 };