futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: vulkan-loader: Don't build (and install) googletest.

Browse Source 
* 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.
This commit is contained in:
Marius Bakke 2023-01-08 20:58:53 +01:00
parent 2aa2fbf18b
commit 0d65f7daae
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/vulkan.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; 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 © 2021 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@protonmail.com> ;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;; Copyright © 2022 dan <i@dan.games> ;;; Copyright © 2022 dan <i@dan.games>
@ -235,8 +235,6 @@ interpretation of the specifications for these languages.")
(dirname (dirname (dirname (dirname
(search-input-directory (search-input-directory
%build-inputs "include/vulkan")))) %build-inputs "include/vulkan"))))
(string-append "-DGOOGLETEST_INSTALL_DIR="
(getcwd) "/source/external/googletest")
"-DBUILD_TESTS=ON") "-DBUILD_TESTS=ON")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
@ -248,14 +246,19 @@ interpretation of the specifications for these languages.")
(substitute* "loader/vulkan.pc.in" (substitute* "loader/vulkan.pc.in"
(("^includedir=.*") (("^includedir=.*")
(string-append "includedir=" vulkan-headers "\n")))))) (string-append "includedir=" vulkan-headers "\n"))))))
(add-after 'unpack 'unpack-googletest (add-after 'unpack 'use-system-googletest
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda _
(let ((gtest (search-input-directory (or native-inputs inputs) ;; Inform the build system that googletest is already built.
"googletest"))) (substitute* "CMakeLists.txt"
(copy-recursively (dirname gtest) ((".*if\\(TARGET gtest\\)")
"external/googletest"))))))) (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 (native-inputs
(list (package-source googletest) (list googletest
libxrandr libxrandr
pkg-config pkg-config
python python