Skip to content

Commit

Permalink
Remove unused conan variables and setup
Browse files Browse the repository at this point in the history
  • Loading branch information
alxvth committed Oct 9, 2024
1 parent 4f5ad3d commit 75e8bf2
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions conanfile.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
from conans import ConanFile
from conan.tools.cmake import CMakeDeps, CMake, CMakeToolchain
from conan.tools.cmake import CMake, CMakeToolchain
from conans.tools import save, load
from rules_support import PluginBranchInfo
import os
import shutil
import pathlib
import subprocess
from rules_support import PluginBranchInfo
import re

def compatibility(os, compiler, compiler_version):
# On macos fallback to zlib apple-clang 13
if os == "Macos" and compiler == "apple-clang" and bool(re.match("14.*", compiler_version)):
print("Compatibility match")
return ["zlib/1.3:compiler.version=13"]
return None

class ExamplePluginsConan(ConanFile):
"""Class to package ExamplePlugins using conan
Expand All @@ -33,9 +24,6 @@ class ExamplePluginsConan(ConanFile):
author = "B. van Lew b.van_lew@lumc.nl" # conan recipe author
license = "MIT"

short_paths = True
generators = "CMakeDeps"

# Options may need to change depending on the packaged library
settings = {"os": None, "build_type": None, "compiler": None, "arch": None}
options = {"shared": [True, False], "fPIC": [True, False]}
Expand All @@ -56,7 +44,6 @@ def __get_git_path(self):
return path

def export(self):
print("In export")
# save the original source path to the directory used to build the package
save(
pathlib.Path(self.export_folder, "__gitpath.txt"),
Expand Down Expand Up @@ -112,7 +99,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")

# Find ManiVault with find_package
tc.variables["ManiVault_DIR"] = self.manivault_dir
print("ManiVault_DIR: ", self.manivault_dir)
Expand Down

0 comments on commit 75e8bf2

Please sign in to comment.