Correct dependencies in CI files

Author: JulianThijssen

CMakeLists.txt

@@ -22,6 +22,14 @@ endif(MSVC)
 # -----------------------------------------------------------------------------
 # Dependencies
 # -----------------------------------------------------------------------------
+if(NOT DEFINED MV_CMD_INSTALL_DIR) 
+    set(MV_CMD_INSTALL_DIR ${ManiVault_INSTALL_DIR} CACHE PATH "Directory where CellMorphologyData is installed")
+endif()
+
+if(NOT DEFINED MV_EPD_INSTALL_DIR) 
+    set(MV_EPD_INSTALL_DIR ${ManiVault_INSTALL_DIR} CACHE PATH "Directory where EphysData is installed")
+endif()
+
 #find_package(OpenSSL REQUIRED)
 find_package(Qt6 COMPONENTS Widgets WebEngineWidgets OpenGLWidgets REQUIRED)
 
@@ -136,10 +144,12 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Network)
 # to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder
 set(MV_LINK_PATH "${ManiVault_INSTALL_DIR}/$<CONFIGURATION>/lib")
 set(PLUGIN_LINK_PATH "${ManiVault_INSTALL_DIR}/$<CONFIGURATION>/$<IF:$<CXX_COMPILER_ID:MSVC>,lib,Plugins>")
+set(CMDPLUGIN_LINK_PATH "${MV_CMD_INSTALL_DIR}/$<CONFIGURATION>/$<IF:$<CXX_COMPILER_ID:MSVC>,lib,Plugins>")
+set(EPDPLUGIN_LINK_PATH "${MV_EPD_INSTALL_DIR}/$<CONFIGURATION>/$<IF:$<CXX_COMPILER_ID:MSVC>,lib,Plugins>")
 set(MV_LINK_SUFFIX $<IF:$<CXX_COMPILER_ID:MSVC>,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>)
 
-set(CELL_MORPHOLOGY_DATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}CellMorphologyData${MV_LINK_SUFFIX}")
-set(EPHYS_DATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}EphysData${MV_LINK_SUFFIX}")
+set(CELL_MORPHOLOGY_DATA_LINK_LIBRARY "${CMDPLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}CellMorphologyData${MV_LINK_SUFFIX}")
+set(EPHYS_DATA_LINK_LIBRARY "${EPDPLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}EphysData${MV_LINK_SUFFIX}")
 
 # Link to ManiVault and data plugins
 target_link_libraries(${PROJECT_NAME} PRIVATE ManiVault::Core)

conanfile.py

@@ -107,6 +107,9 @@ def generate(self):
         MV_CMD_PATH = pathlib.Path(self.deps_cpp_info["CellMorphologyData"].rootpath).as_posix()
         tc.variables["MV_CMD_INSTALL_DIR"] = MV_CMD_PATH
 
+        MV_EPD_PATH = pathlib.Path(self.deps_cpp_info["EphysData"].rootpath).as_posix()
+        tc.variables["MV_EPD_INSTALL_DIR"] = MV_EPD_PATH
+
         # Set some build options
         tc.variables["MV_UNITY_BUILD"] = "ON"