mbakke pushed a commit to branch master
in repository guix.
commit 9fda25caff4f7e7df375dec44804c4cebb1a0643
Author: Marius Bakke <[email protected]>
AuthorDate: Tue Aug 9 21:23:22 2022 +0200
gnu: box2d: Unbundle doctest.
* gnu/packages/game-development.scm (box2d)[source](snippet): Delete
doctest,
and adjust accordingly.
[native-inputs]: Add DOCTEST.
---
gnu/packages/game-development.scm | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/game-development.scm
b/gnu/packages/game-development.scm
index 090e7f7d12..3e0301a199 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -13,7 +13,7 @@
;;; Copyright © 2017 Peter Mikkelsen <[email protected]>
;;; Copyright © 2017 Arun Isaac <[email protected]>
;;; Copyright © 2017, 2019 Rutger Helling <[email protected]>
-;;; Copyright © 2018 Marius Bakke <[email protected]>
+;;; Copyright © 2018, 2022 Marius Bakke <[email protected]>
;;; Copyright © 2019 Pierre Neidhardt <[email protected]>
;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler
<[email protected]>
;;; Copyright © 2019 Jethro Cao <[email protected]>
@@ -2467,13 +2467,23 @@ rigid body physics library written in C.")
(modules '((guix build utils)))
(snippet
'(begin
- ;; Bundled code only used for the testbed.
- (delete-file-recursively "extern")))))
+ ;; Remove bundled code only used for the testbed.
+ (delete-file-recursively "extern")
+ ;; Remove bundled copy of doctest, and adjust tests accordingly.
+ (delete-file "unit-test/doctest.h")
+ (substitute* "unit-test/CMakeLists.txt"
+ (("doctest\\.h")
+ ""))
+ (substitute* (find-files "unit-test" "\\.cpp$")
+ (("include \"doctest\\.h\"")
+ "include <doctest/doctest.h>"))))))
(build-system cmake-build-system)
(arguments
`(#:test-target "unit_test"
#:configure-flags '("-DBUILD_SHARED_LIBS=ON"
"-DBOX2D_BUILD_TESTBED=OFF")))
+ (native-inputs
+ (list doctest)) ;for tests
(inputs
(list libx11))
(home-page "https://box2d.org/";)
