guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/06: gnu: opencv: Don't hardcode build directories.


From: guix-commits
Subject: 02/06: gnu: opencv: Don't hardcode build directories.
Date: Mon, 14 Jan 2019 08:08:05 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit b5baf9529e65c2aff07375e26d5c860b68ca0bb9
Author: Efraim Flashner <address@hidden>
Date:   Mon Jan 14 10:01:52 2019 +0200

    gnu: opencv: Don't hardcode build directories.
    
    * gnu/packages/image-processing.scm (opencv)[arguments]: Change
    OPENCV_EXTRA_MODULES_PATH and OPENCV_TEST_DATA_PATH to use 'getcwd'
    instead of hardcoding the build path.
---
 gnu/packages/image-processing.scm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/image-processing.scm 
b/gnu/packages/image-processing.scm
index 9be9ced..a27da6a 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -255,15 +255,12 @@ integrates with various databases on GUI toolkits such as 
Qt and Tk.")
              "-DBUILD_PERF_TESTS=OFF"
              "-DBUILD_TESTS=ON"
 
-             (string-append "-DOPENCV_EXTRA_MODULES_PATH="
-                            "/tmp/guix-build-opencv-" ,version ".drv-0"
+             (string-append "-DOPENCV_EXTRA_MODULES_PATH=" (getcwd)
                             "/opencv-contrib/opencv_contrib-" ,version
                             "/modules")
 
              ;;Define test data:
-             (string-append "-DOPENCV_TEST_DATA_PATH="
-                            "/tmp/guix-build-opencv-" ,version ".drv-0"
-                            ;;"/opencv-3.4.0"
+             (string-append "-DOPENCV_TEST_DATA_PATH=" (getcwd)
                             "/opencv-extra/opencv_extra-" ,version
                             "/testdata")
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]