Unverified Commit 4b7a4ff6 authored by Ivan Mincik's avatar Ivan Mincik Committed by GitHub
Browse files

itk: fix build with gcc 15 (#481742)

parents 73c3561a 7c069b42

pkgs/by-name/ot/otb/package.nix

+11 −0
Original line number Diff line number Diff line
@@ -98,6 +98,17 @@ let 
    postPatch = ''

      substituteInPlace Modules/ThirdParty/KWSys/src/KWSys/CMakeLists.txt \

      --replace-fail 'cmake_minimum_required(VERSION 3.1 FATAL_ERROR)' 'cmake_minimum_required(VERSION 3.10)'

      # fix build with GCC 15

      substituteInPlace Modules/ThirdParty/GoogleTest/src/itkgoogletest/googletest/src/gtest-death-test.cc \

        --replace-fail \

          '#include <utility>' \

          '#include <utility>

          #include <cstdint>'

      substituteInPlace Modules/Core/Common/include/itkFloatingPointExceptions.h \

        --replace-fail \

          '#include "itkSingletonMacro.h"' \

          '#include "itkSingletonMacro.h"

          #include <cstdint>'

    '';



    # fix the CMake config files for ITK which contains double slashes

pkgs/development/libraries/itk/generic.nix

+12 −0
Original line number Diff line number Diff line
@@ -94,6 +94,18 @@ stdenv.mkDerivation { 
    ln -sr ${itkAdaptiveDenoisingSrc} Modules/External/ITKAdaptiveDenoising

    ln -sr ${itkSimpleITKFiltersSrc} Modules/External/ITKSimpleITKFilters

    ln -sr ${rtkSrc} Modules/Remote/RTK



    # fix build with GCC 15

    substituteInPlace Modules/ThirdParty/GoogleTest/src/itkgoogletest/googletest/src/gtest-death-test.cc \

      --replace-fail \

        '#include <utility>' \

        '#include <utility>

        #include <cstdint>'

    substituteInPlace Modules/Core/Common/include/itkFloatingPointExceptions.h \

      --replace-fail \

        '#include "itkSingletonMacro.h"' \

        '#include "itkSingletonMacro.h"

        #include <cstdint>'

  '';



  cmakeFlags = [