me
/
guix
Archived
1
0
Fork 0
Code

gnu: cli11: Remove (guix utils) dependency. 

* gnu/packages/cpp.scm (cli11)[arguments]: Do not import (guix utils) that is
not meant to go on the build side.
master
Mathieu Othacehe 2021-02-23 12:39:15 +01:00
parent 0de0074844
commit b4f28584d3
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/cpp.scm
View File

@ -928,17 +928,18 @@ conversions to and from strings, iteration and related functionality.")
`(#:configure-flags `(#:configure-flags
'("-DCLI11_SINGLE_FILE=OFF" '("-DCLI11_SINGLE_FILE=OFF"
"-DCLI11_BUILD_EXAMPLES=OFF") "-DCLI11_BUILD_EXAMPLES=OFF")
#:imported-modules ,(append %cmake-build-system-modules #:imported-modules ,%cmake-build-system-modules
(source-module-closure '((guix utils)))) #:modules ((guix build cmake-build-system)
(guix build utils))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'no-vendor-gtest (add-before 'configure 'no-vendor-gtest
(lambda _ (lambda _
(use-modules (guix utils))
(substitute* "tests/CMakeLists.txt" (substitute* "tests/CMakeLists.txt"
;; We provide our own googletest, so this is not really a problem. ;; We provide our own googletest, so this is not really a
(("message\\(FATAL_ERROR \"You have requested tests be built, but googletest is not downloaded." msg) ;; problem.
(string-replace-substring msg "FATAL_ERROR" "TRACE"))) (("message\\(FATAL_ERROR \"You have requested")
"message(TRACE \"You have requested"))
(substitute* "cmake/AddGoogletest.cmake" (substitute* "cmake/AddGoogletest.cmake"
(("^add_subdirectory\\(.*googletest.*$") "find_package(GTest REQUIRED)") (("^add_subdirectory\\(.*googletest.*$") "find_package(GTest REQUIRED)")
(("^set_target_properties\\(gtest gtest_main gmock gmock_main") "") (("^set_target_properties\\(gtest gtest_main gmock gmock_main") "")