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) guix
Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/axoloti.scm
AgeCommit message (Expand)Author
2023-12-20gnu: axoloti-patcher: Remove trailing #T....* gnu/packages/axoloti.scm (axoloti-patcher)[arguments]: Remove trailing #T from build phase. Change-Id: I1a741e41e7ae167cd72542c3f9cf9a13046bcd3c Ricardo Wurmus
2023-12-20gnu: axoloti-patcher: Fix include paths....* gnu/packages/axoloti.scm (axoloti-patcher)[arguments]: Add missing "c++" sub-directory to search paths. Change-Id: Ia3297cb24e02f92ad7af40881b9021af25093e67 Ricardo Wurmus
2023-09-25gnu: embedded: Turn packages using top-level variables into procedures....Fixes <https://issues.guix.gnu.org/65716>. Before this change, simply adding the following import: modified gnu/packages/firmware.scm @@ -42,6 +42,7 @@ (define-module (gnu packages firmware) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages assembly) + #:use-module (gnu packages avr) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) Would cause byte compilation and/or evaluation to fail due to a circular module dependency. * gnu/packages/embedded.scm: Add commentary. (gcc-arm-none-eabi-4.9, gcc-arm-none-eabi-6, newlib-arm-none-eabi) (newlib-nano-arm-none-eabi, gcc-arm-none-eabi-7-2018-q2-update) (newlib-arm-none-eabi-7-2018-q2-update) (newlib-nano-arm-none-eabi-7-2018-q2-update) (arm-none-eabi-toolchain-4.9, arm-none-eabi-nano-toolchain-4.9) (arm-none-eabi-toolchain-6, arm-none-eabi-nano-toolchain-6) (arm-none-eabi-toolchain-7-2018-q2-update, gdb-arm-none-eabi) (propeller-binutils, propeller-gcc-6, propeller-gcc-4) (propeller-gcc, propeller-toolchain, propeller-development-suite) (gcc-vc4): Turn into procedures, prefixing the procedure name with 'make-', and adjust all users. (make-libstdc++-arm-none-eabi) [arguments]: Avoid an unused warning. (arm-none-eabi-toolchain): Rename to... (make-arm-none-eabi-toolchain): ... this. * gnu/packages/raspberry-pi.scm (raspi-arm-chainloader) [native-inputs]: Replace gcc-arm-none-eabi-6 with (make-arm-none-eabi-toolchain). * gnu/packages/axoloti.scm (axoloti-runtime) [inputs]: Replace arm-none-eabi-nano-toolchain-4.9 with (make-arm-none-eabi-nano-toolchain-4.9). (axoloti-patcher): Likewise. (axoloti-patcher-next) [inputs]: Replace arm-none-eabi-nano-toolchain-7-2018-q2-update with (make-arm-none-eabi-nano-toolchain-7-2018-q2-update). Series-changes: 2 - Use mlambda for procedures Maxim Cournoyer