Change HDPS_INSTALL_DIR to MV_INSTALL_DIR

HDPS/CMakeLists.txt

@@ -42,15 +42,15 @@ include(CMakeCheckSetAVX)
 # Normalize the incoming install path
 file(TO_CMAKE_PATH ${INSTALL_DIR} INSTALL_DIR)
 
-if(DEFINED ENV{HDPS_INSTALL_DIR})
-    set(ENV_HDPS_INSTALL_DIR "$ENV{HDPS_INSTALL_DIR}")
-    file(TO_CMAKE_PATH ${ENV_HDPS_INSTALL_DIR} ENV_HDPS_INSTALL_DIR)
+if(DEFINED ENV{MV_INSTALL_DIR})
+    set(ENV_MV_INSTALL_DIR "$ENV{MV_INSTALL_DIR}")
+    file(TO_CMAKE_PATH ${ENV_MV_INSTALL_DIR} ENV_MV_INSTALL_DIR)
 
-    if ("${INSTALL_DIR}" STREQUAL "${ENV_HDPS_INSTALL_DIR}")
+    if ("${INSTALL_DIR}" STREQUAL "${ENV_MV_INSTALL_DIR}")
         set(messageText 
         "***************************************************
-        Using environment variable HDPS_INSTALL_DIR 
-        $ENV{HDPS_INSTALL_DIR}
+        Using environment variable MV_INSTALL_DIR 
+        $ENV{MV_INSTALL_DIR}
         to indicate where the ManiVault output will be installed,
         make sure the directory exists.
         ***************************************************")
@@ -61,7 +61,7 @@ if(DEFINED ENV{HDPS_INSTALL_DIR})
 endif()
 
 if(NOT DEFINED INSTALL_DIR)
-    message(FATAL_ERROR "No install path provided! Set the cmake variable INSTALL_DIR or environment variable HDPS_INSTALL_DIR")
+    message(FATAL_ERROR "No install path provided! Set the cmake variable INSTALL_DIR or environment variable MV_INSTALL_DIR")
 else()
     message(STATUS "Install ManiVault to ${INSTALL_DIR}")
 endif()

HDPS/src/plugins/ClusterData/CMakeLists.txt

@@ -14,7 +14,7 @@ if(MSVC)
 endif(MSVC)
 
 # Get the env path and allow the user to change it
-set(INSTALL_DIR $ENV{MV_INSTALL_DIR} CACHE PATH "The ManiVault Install Directoy")
+set(INSTALL_DIR $ENV{MV_INSTALL_DIR} CACHE PATH "The ManiVault Install Directory")
 # Normalize the incoming install path
 file(TO_CMAKE_PATH ${INSTALL_DIR} INSTALL_DIR)
 

conanfile.py

@@ -19,7 +19,7 @@ class HdpsCoreConan(ConanFile):
     Packages both RELEASE and DEBUG.
     Uses rules_support (github.com/hdps/rulessupport) to derive
     versioninfo based on the branch naming convention
-    as described in https://github.com/hdps/core/wiki/Branch-naming-rules
+    as described in https://github.com/ManiVaultStudio/core/wiki/Branch-naming-rules
     """
 
     name = "hdps-core"
@@ -29,7 +29,7 @@ class HdpsCoreConan(ConanFile):
     # topics can get used for searches, GitHub topics, Bintray tags etc.
     # Add here keywords about the library
     topics = ("conan", "analysis", "n-dimensional", "plugin")
-    url = "https://github.com/hdps/core"
+    url = "https://github.com/ManiVaultStudio/core"
     branch = "develop"  # should come from profile
     author = "B. van Lew <b.van_lew@lumc.nl>"
     license = (
@@ -172,11 +172,11 @@ def build(self):
             pathlib.Path(self.__get_git_path(), "__last_build_folder.txt"),
             self.build_folder,
         )
-        # If the user has no preference in HDPS_INSTALL_DIR simply set the install dir
-        if not os.environ.get("HDPS_INSTALL_DIR", None):
-            os.environ["HDPS_INSTALL_DIR"] = os.path.join(self.build_folder, "install")
-        print("HDPS_INSTALL_DIR: ", os.environ["HDPS_INSTALL_DIR"])
-        self.install_dir = os.environ["HDPS_INSTALL_DIR"]
+        # If the user has no preference in MV_INSTALL_DIR simply set the install dir
+        if not os.environ.get("MV_INSTALL_DIR", None):
+            os.environ["MV_INSTALL_DIR"] = os.path.join(self.build_folder, "install")
+        print("MV_INSTALL_DIR: ", os.environ["MV_INSTALL_DIR"])
+        self.install_dir = os.environ["MV_INSTALL_DIR"]
 
         cmake = self._configure_cmake()
         cmake.build(build_type="Debug")
@@ -189,11 +189,11 @@ def build(self):
     def package(self):
         # if just running package
         if self.install_dir is None:
-            if not os.environ.get("HDPS_INSTALL_DIR", None):
-                os.environ["HDPS_INSTALL_DIR"] = os.path.join(
+            if not os.environ.get("MV_INSTALL_DIR", None):
+                os.environ["MV_INSTALL_DIR"] = os.path.join(
                     self.build_folder, "install"
                 )
-            self.install_dir = os.environ["HDPS_INSTALL_DIR"]
+            self.install_dir = os.environ["MV_INSTALL_DIR"]
 
         print("Packaging install dir: ", self.install_dir)
         print("Options macos: ", self.options["macos_bundle"])