diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt index 65a9d28..fa6cc46 100644 --- a/ExampleDependencies/CMakeLists.txt +++ b/ExampleDependencies/CMakeLists.txt @@ -71,6 +71,8 @@ add_library(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES}) # Include ManiVault headers, including system data plugins target_include_directories(${PROJECT_NAME} PRIVATE "${ManiVault_INCLUDE_DIR}") +message(STATUS "ManiVault_INCLUDE_DIR: ${ManiVault_INCLUDE_DIR}") + # ----------------------------------------------------------------------------- # Target properties # ----------------------------------------------------------------------------- diff --git a/conanfile.py b/conanfile.py index 4976ed5..ca1e882 100644 --- a/conanfile.py +++ b/conanfile.py @@ -109,16 +109,30 @@ def generate(self): # for Qt < 6.4.2 tc.variables["CMAKE_PREFIX_PATH"] = qt_dir + if os.environ.get("ManiVault_DIR", None): + print("ManiVault_DIR: defined on CI") + else: + print("ManiVault_DIR: not defined on CI") + if os.environ.get("MV_INSTALL_DIR", None): + print("ManiVault_DIR: defined on CI") + else: + print("ManiVault_DIR: not defined on CI") + # Set the installation directory for ManiVault based on the MV_INSTALL_DIR environment variable # or if none is specified, set it to the build/install dir. - if not os.environ.get("MV_INSTALL_DIR", None): + if os.environ.get("ManiVault_DIR", None): + self.manivault_dir = pathlib.Path(os.environ["ManiVault_DIR"]).as_posix() + else: + self.manivault_dir = self.install_dir + '/cmake/mv/' os.environ["MV_INSTALL_DIR"] = os.path.join(self.build_folder, "install") - print("MV_INSTALL_DIR: ", os.environ["MV_INSTALL_DIR"]) + self.install_dir = pathlib.Path(os.environ["MV_INSTALL_DIR"]).as_posix() + self.install_dir = pathlib.Path(os.environ["MV_INSTALL_DIR"]).as_posix() # Find ManiVault with find_package - self.manivault_dir = self.install_dir + '/cmake/mv/' + tc.variables["ManiVault_DIR"] = self.manivault_dir + print("ManiVault_DIR: ", self.install_dir) # Set some build options tc.variables["MV_UNITY_BUILD"] = "ON"