diff --git a/pcl/conanfile.py b/pcl/conanfile.py index 1cad5c5..586fbc2 100644 --- a/pcl/conanfile.py +++ b/pcl/conanfile.py @@ -20,12 +20,12 @@ class PclConan(ConanFile): """ def requirements(self): - self.requires("Eigen3/3.3.4@%s/%s"%(self.user, self.channel)) - self.requires("VTK/7.1.1@%s/%s"%(self.user, self.channel)) + self.requires("eigen/3.3.4@conan/stable") + self.requires("VTK/7.1.0@bilke/stable") +# self.requires("VTK/7.1.1@%s/%s"%(self.user, self.channel)) self.requires("flann/1.8.4@%s/%s"%(self.user, self.channel)) self.requires("QHull/2015.2@%s/%s"%(self.user, self.channel)) self.requires("boost/1.66.0@conan/stable") - self.requires("flann/1.8.4@%s/%s"%(self.user, self.channel)) def source(self): self.run("git clone --branch pcl-%s --single-branch https://github.com/PointCloudLibrary/pcl.git" %(self.version)) diff --git a/qhull/conanfile.py b/qhull/conanfile.py index 7dde986..f76e255 100644 --- a/qhull/conanfile.py +++ b/qhull/conanfile.py @@ -4,6 +4,7 @@ import os class QhullConan(ConanFile): name = "QHull" + version = "2015.2" license = "https://github.com/Av3m/conan-qhull.git" url = "http://www.qhull.org" settings = "os", "compiler", "build_type", "arch" @@ -13,7 +14,8 @@ class QhullConan(ConanFile): def source(self): self.run("git clone https://github.com/qhull/qhull.git") - self.run("cd qhull && git checkout %s" %(self.version) ) + self.run("cd qhull && git checkout 5a79a0009454c86e9848646b3c296009125231bf") + # self.run("cd qhull && git checkout %s" %(self.version) ) # This small hack might be useful to guarantee proper /MT /MD linkage in MSVC # if the packaged project doesn't have variables to set it properly