The VTK_MAJOR_VERSION macro is not available by default in newer versions. This is a hack to expose it without changing all imports. diff --git a/addons/vtk/CMakeLists.txt b/addons/vtk/CMakeLists.txt --- a/addons/vtk/CMakeLists.txt +++ b/addons/vtk/CMakeLists.txt @@ -36,6 +36,8 @@ IF(WITH_VTKIO) ELSE() SET(SELECTED_VTK_LIBS ${VTK_MODULES_REQUESTED}) ENDIF() + + add_compile_definitions(VTK_MAJOR_VERSION=${VTK_VERSION_MAJOR}) SET(VTK_LINK_LIBS_MESH ${SELECTED_VTK_LIBS} miamesh) SET(VTK_LINK_LIBS_3D ${SELECTED_VTK_LIBS} mia3d)
Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/tests/import-utils.scm
AgeCommit message (Expand)Author
2021-09-01import: utils: Skip not found packages....* guix/import/utils.scm (recursive-import): Skip packages when the package returned by 'repo->guix-package' is false. * tests/import-utils.scm: New tests. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Sarah Morgensen
2020-12-27import/utils: alist->package: Handle SPDX license names only as fallback....Fixes <https://bugs.gnu.org/45453>. * guix/import/utils.scm (alist->package): Find plain license names in (guix licenses) first, and only fall back to SPDX names on error. * tests/import-utils.scm ("alist->package with SPDX license name 1/2", "alist->package with SPDX license name 2/2"): New tests. Ricardo Wurmus
2020-12-02import: utils: 'recursive-import' accepts an optional version parameter....This adds a key VERSION to 'recursive-import' and moves the parameter REPO to a key. This also changes all the places that rely on 'recursive-import'. * guix/import/utils.scm (recursive-import): Add the VERSION key. Make REPO a key. (package->definition): Add optional 'append-version?'. * guix/scripts/import/crate.scm (guix-import-crate): Add the VERSION key. * guix/import/crate.scm (crate->guix-package): Add the VERSION key. (crate-recursive-import): Pass VERSION to recursive-import, remove now unnecessary code. * guix/import/cran.scm (cran->guix-package, cran-recursive-import): Change the REPO parameter to a key. * guix/import/elpa.scm (elpa->guix-package, elpa-recursive-import): Likewise. * guix/import/gem.scm (gem->guix-package, recursive-import): Likewise. * guix/import/opam.scm (opam-recurive-import): Likewise. * guix/import/pypi.scm (pypi-recursive-import): Likewise. * guix/import/stackage.scm (stackage-recursive-import): Likewise. * guix/scripts/import/cran.scm (guix-import-cran): Likewise. * guix/scripts/import/elpa.scm (guix-import-elpa): Likewise. * tests/elpa.scm (eval-test-with-elpa): Likewise. * tests/import-utils.scm (recursive-import): Likewise. Co-authored-by: Hartmut Goebel <h.goebel@crazy-compilers.com> Martin Becze