diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-03-09 16:35:41 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-03-09 16:35:41 +0100 |
| commit | e90e0fad1b3ba79d81f02424e143ee6f4f736e8b (patch) | |
| tree | 2c26190fd9114199b0ef79303e18a61100cab4af /gnu/packages/check.scm | |
| parent | 8ea0700d231a8819fc7e8332e9685f0ce15c174e (diff) | |
| parent | 9ec2a4d3fec44f08a55df9f5f3d1a04b83e7fcf6 (diff) | |
| download | guix-e90e0fad1b3ba79d81f02424e143ee6f4f736e8b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/check.scm')
| -rw-r--r-- | gnu/packages/check.scm | 44 |
1 files changed, 4 insertions, 40 deletions
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9ad03cd558..372f1c4fea 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -201,7 +201,7 @@ normally do not detect. The goal is to detect only real errors in the code (define-public googletest (package (name "googletest") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) @@ -210,46 +210,10 @@ normally do not detect. The goal is to detect only real errors in the code (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1k0nf1l9cb3prdmsvaajl5i31bx86c1mw0d5jgzykz7rzm36afpp")))) - (build-system gnu-build-system) + "1n5p1m2m3fjrjdj752lf92f9wq3pl5cbsfrb49jqbg52ghkz99jq")))) + (build-system cmake-build-system) (native-inputs - `(("python-2" ,python-2) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'autoconf - (lambda _ - (zero? (system* "autoreconf" "-vfi")))) - (add-before 'autoconf 'generate-headers - (lambda _ - (begin - (delete-file "include/gtest/gtest-param-test.h") - (system* "python2" "scripts/pump.py" - "include/gtest/gtest-param-test.h.pump") - (delete-file "include/gtest/internal/gtest-tuple.h") - (system* "python2" "scripts/pump.py" - "include/gtest//internal/gtest-tuple.h.pump") - (delete-file - "include/gtest/internal/gtest-param-util-generated.h") - (system* - "python2" "scripts/pump.py" - "include/gtest/internal/gtest-param-util-generated.h.pump") - (delete-file "include/gtest/internal/gtest-type-util.h") - (system* "python2" "scripts/pump.py" - "include/gtest/internal/gtest-type-util.h.pump")))) - (replace 'install - (lambda _ - (let ((out (assoc-ref %outputs "out"))) - (begin - (install-file "lib/.libs/libgtest_main.a" - (string-append out "/lib")) - (install-file "lib/.libs/libgtest.a" - (string-append out "/lib")) - (copy-recursively "include" - (string-append out "/include"))))))))) + `(("python-2" ,python-2))) (home-page "https://github.com/google/googletest/") (synopsis "Test discovery and XUnit test framework") (description "Google Test features an XUnit test framework, automated test |