Supply MV_INSTALL_DIR through conan

ManiVaultStudio · Oct 11, 2023 · 8be120b · 8be120b
1 parent 32499ca
commit 8be120b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/HDPS/CMakeLists.txt b/HDPS/CMakeLists.txt
@@ -18,6 +18,8 @@ if(MSVC)
     set(LINK_TYPE STATIC)
 endif(MSVC)
 
+message(STATUS "ManiVault Install dir: ${MV_INSTALL_DIR}")
+
 # -----------------------------------------------------------------------------
 # CMake Settings
 # -----------------------------------------------------------------------------

diff --git a/conanfile.py b/conanfile.py
@@ -143,6 +143,7 @@ def generate(self):
         qtpath = pathlib.Path(self.deps_cpp_info["qt"].rootpath)
         qt_root = str(list(qtpath.glob("**/Qt6Config.cmake"))[0].parents[3].as_posix())
         tc.variables["CMAKE_PREFIX_PATH"] = f"{qt_root}"
+        tc.variables["MV_INSTALL_DIR"] = self.install_dir
         #tc.variables["Qt6_ROOT"] = qt_root
 
         zlibpath = pathlib.Path(self.deps_cpp_info["zlib"].rootpath).as_posix()
@@ -161,7 +162,7 @@ def generate(self):
     def _configure_cmake(self):
         cmake = CMake(self)
         cmake.verbose = True
-        cmake.configure(build_script_folder="hdps/core")
+        cmake.configure(variables={"MV_INSTALL_DIR": self.install_dir}, build_script_folder="hdps/core")
         return cmake
 
     def build(self):