[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
118/416: gnu: vulkan-loader: Don't build (and install) googletest.
From: |
guix-commits |
Subject: |
118/416: gnu: vulkan-loader: Don't build (and install) googletest. |
Date: |
Fri, 14 Apr 2023 15:25:32 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 5a190fce5f37cfa102d87d7c94c98fb73c6281d2
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Jan 8 20:58:53 2023 +0100
gnu: vulkan-loader: Don't build (and install) googletest.
* gnu/packages/vulkan.scm (vulkan-loader)[arguments]: Add phase to use
system
googletest. Remove unpack-googletest phase.
[native-inputs]: Change from (PACKAGE-SOURCE GOOGLETEST) to GOOGLETEST.
---
gnu/packages/vulkan.scm | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index e0ff2dc71b..dfc073b379 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2020, 2023 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;; Copyright © 2022 dan <i@dan.games>
@@ -232,8 +232,6 @@ interpretation of the specifications for these languages.")
(dirname (dirname
(search-input-directory
%build-inputs "include/vulkan"))))
- (string-append "-DGOOGLETEST_INSTALL_DIR="
- (getcwd) "/source/external/googletest")
"-DBUILD_TESTS=ON")
#:phases
#~(modify-phases %standard-phases
@@ -245,14 +243,19 @@ interpretation of the specifications for these
languages.")
(substitute* "loader/vulkan.pc.in"
(("^includedir=.*")
(string-append "includedir=" vulkan-headers "\n"))))))
- (add-after 'unpack 'unpack-googletest
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (let ((gtest (search-input-directory (or native-inputs inputs)
- "googletest")))
- (copy-recursively (dirname gtest)
- "external/googletest")))))))
+ (add-after 'unpack 'use-system-googletest
+ (lambda _
+ ;; Inform the build system that googletest is already built.
+ (substitute* "CMakeLists.txt"
+ ((".*if\\(TARGET gtest\\)")
+ (string-append " find_package(GTest REQUIRED)\n"
+ " if(true)")))
+ ;; Use the namespaced variable.
+ (substitute* "tests/framework/CMakeLists.txt"
+ (("PUBLIC gtest ")
+ "PUBLIC GTest::gtest ")))))))
(native-inputs
- (list (package-source googletest)
+ (list googletest
libxrandr
pkg-config
python
- 180/416: gnu: rust-new-debug-unreachable-1: Update to 1.0.4., (continued)
- 180/416: gnu: rust-new-debug-unreachable-1: Update to 1.0.4., guix-commits, 2023/04/14
- 181/416: gnu: rust-num-rational-0.2: Update to 0.2.4., guix-commits, 2023/04/14
- 184/416: gnu: rust-pin-project-0.4: Update to 0.4.30., guix-commits, 2023/04/14
- 182/416: gnu: rust-rand-pcg-0.3: Update to 0.3.1., guix-commits, 2023/04/14
- 188/416: gnu: Remove lash., guix-commits, 2023/04/14
- 198/416: gnu: rust-curl-sys-0.4: Update to 0.4.53+curl-7.82.0., guix-commits, 2023/04/14
- 87/416: gnu: rust-serde-derive: Skip build., guix-commits, 2023/04/14
- 97/416: gnu: Add rust-ciborium-io., guix-commits, 2023/04/14
- 98/416: gnu: Add rust-ciborium-ll., guix-commits, 2023/04/14
- 111/416: gnu: glslang: Install all libraries., guix-commits, 2023/04/14
- 118/416: gnu: vulkan-loader: Don't build (and install) googletest.,
guix-commits <=
- 119/416: gnu: rust-crossbeam-utils-0.8: Update to 0.8.14., guix-commits, 2023/04/14
- 113/416: gnu: sdl2: Update to 2.26.1., guix-commits, 2023/04/14
- 114/416: gnu: postgresql@14: Update to 14.6., guix-commits, 2023/04/14
- 120/416: gnu: rust-lock-api-0.4: Update to 0.4.9., guix-commits, 2023/04/14
- 122/416: gnu: rust-parking-lot-0.12: Fix build., guix-commits, 2023/04/14
- 128/416: gnu: rust-serde-derive-1: Update to 1.0.152., guix-commits, 2023/04/14
- 123/416: gnu: rust-parking-lot-core-0.9: Update to 0.9.6., guix-commits, 2023/04/14
- 132/416: gnu: rust-codespan-reporting-0.11: Update to 0.11.1., guix-commits, 2023/04/14
- 139/416: gnu: rust-serde-path-to-error-0.1: Update to 0.1.9., guix-commits, 2023/04/14
- 148/416: gnu: rust-crossbeam-queue-0.3: Update to 0.3.8., guix-commits, 2023/04/14