wassname/conan-packages
1
0
Fork 0
mirror of https://github.com/wassname/conan-packages.git synced 2026-06-27 16:15:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed to qhull

Browse Source
This commit is contained in:
wassname
2018-07-17 09:11:09 +08:00
parent 4b6b6dd78e
commit 3f100ecdd5
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcl/conanfile.py
+3 -3
View File
@@ -20,12 +20,12 @@ class PclConan(ConanFile):
""" """
def requirements(self): def requirements(self):
self.requires("Eigen3/3.3.4@%s/%s"%(self.user, self.channel)) self.requires("eigen/3.3.4@conan/stable")
self.requires("VTK/7.1.1@%s/%s"%(self.user, self.channel)) 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("flann/1.8.4@%s/%s"%(self.user, self.channel))
self.requires("QHull/2015.2@%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("boost/1.66.0@conan/stable")
self.requires("flann/1.8.4@%s/%s"%(self.user, self.channel))
def source(self): def source(self):
self.run("git clone --branch pcl-%s --single-branch https://github.com/PointCloudLibrary/pcl.git" %(self.version)) self.run("git clone --branch pcl-%s --single-branch https://github.com/PointCloudLibrary/pcl.git" %(self.version))
qhull/conanfile.py
+3 -1
View File
@@ -4,6 +4,7 @@ import os
class QhullConan(ConanFile): class QhullConan(ConanFile):
name = "QHull" name = "QHull"
version = "2015.2"
license = "https://github.com/Av3m/conan-qhull.git" license = "https://github.com/Av3m/conan-qhull.git"
url = "http://www.qhull.org" url = "http://www.qhull.org"
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
@@ -13,7 +14,8 @@ class QhullConan(ConanFile):
def source(self): def source(self):
self.run("git clone https://github.com/qhull/qhull.git") 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 # 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 # if the packaged project doesn't have variables to set it properly