diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt index fa6cc46..65a9d28 100644 --- a/ExampleDependencies/CMakeLists.txt +++ b/ExampleDependencies/CMakeLists.txt @@ -71,8 +71,6 @@ 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 d1893d8..c611997 100644 --- a/conanfile.py +++ b/conanfile.py @@ -98,7 +98,7 @@ def generate(self): # Use the ManiVault .cmake files mv_core_root = self.deps_cpp_info["hdps-core"].rootpath - self.manivault_dir = os.path.join(mv_core_root, "cmake", "mv") + self.manivault_dir = pathlib.Path(mv_core_root, "cmake", "mv").as_posix() # Find ManiVault with find_package tc.variables["ManiVault_DIR"] = self.manivault_dir @@ -147,7 +147,7 @@ def build(self): cmake.build(build_type="Release") def package(self): - package_dir = os.path.join(self.build_folder, "package") + package_dir = pathlib.Path(self.build_folder, "package").as_posix() print("Packaging install dir: ", package_dir) subprocess.run( [ @@ -157,7 +157,7 @@ def package(self): "--config", "Debug", "--prefix", - os.path.join(package_dir, "Debug"), + pathlib.Path(package_dir, "Debug").as_posix(), ] ) subprocess.run( @@ -168,7 +168,7 @@ def package(self): "--config", "Release", "--prefix", - os.path.join(package_dir, "Release"), + pathlib.Path(package_dir, "Release").as_posix(), ] ) self.copy(pattern="*", src=package_dir)