summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2017-03-21 14:17:11 +0100
committerbartus2017-03-21 14:17:11 +0100
commitea8bcaf2e407a31f8662c27aeb528165ac58c244 (patch)
treec857a345270ffc5b2bff447a62b86f7e770a7263
parentca616257d74c9bcc5da3a97809149f2a7ecd03f5 (diff)
downloadaur-ea8bcaf2e407a31f8662c27aeb528165ac58c244.tar.gz
add cuda dependancies, remove gcc5 as its already satisfied by cuda
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD5
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c6932f6e5dcb..beab6c7f9906 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,10 +7,10 @@ pkgbase = colmap-git
arch = i686
arch = x86_64
license = GPL
+ makedepends = cuda
makedepends = boost
makedepends = git
makedepends = cmake
- makedepends = gcc5
makedepends = eigen
depends = ceres-solver
depends = suitesparse
@@ -20,6 +20,7 @@ pkgbase = colmap-git
depends = freeimage
depends = boost-libs
depends = qt5-base
+ optdepends = cuda: for cuda sfm/mvs acceleration
source = colmap-git::git+https://github.com/colmap/colmap.git
source = colmap-git.install
source = colmap.desktop
diff --git a/PKGBUILD b/PKGBUILD
index af70eb4620b8..c97f396a7e41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,8 @@ url="https://colmap.github.io/"
license=('GPL')
groups=()
depends=('ceres-solver' 'suitesparse' 'freeglut' 'glew' 'google-glog' 'freeimage' 'boost-libs' 'qt5-base')
-makedepends=('boost' 'git' 'cmake' 'gcc5' 'eigen') #gcc5 to fix cud 8.0 compatibility issue.
+makedepends=('cuda' 'boost' 'git' 'cmake' 'eigen')
+optdepends=('cuda: for cuda sfm/mvs acceleration')
provides=()
options=()
install=${pkgname}.install
@@ -31,7 +32,7 @@ build() {
mkdir -p build
cd build
- cmake -DTESTS_ENABLED=OFF -DCUDA_HOST_COMPILER=/usr/bin/gcc-5 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../
+ cmake -DTESTS_ENABLED=OFF -DCUDA_HOST_COMPILER=/opt/cuda/bin/gcc -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../
make
}