Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Windows wrapping #1460

Merged
merged 3 commits into from Dec 4, 2019
Merged

Windows wrapping #1460

merged 3 commits into from Dec 4, 2019

Conversation

thewtex
Copy link
Member

@thewtex thewtex commented Dec 4, 2019

Addresses #1442

@thewtex
Copy link
Member Author

thewtex commented Dec 4, 2019

CI build: https://open.cdash.org/viewBuildError.php?type=1&buildid=6235755

Warning have cropped up, but this addresses the build error.

hjmjohnson
hjmjohnson approved these changes Dec 4, 2019
View reviewed changes
Copy link
Member

@hjmjohnson hjmjohnson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @thewtex It seems like a the CI needs a little more help.

CMakeLists.txt
cmake_dependent_option(ITK_LEGACY_REMOVE
"Remove current legacy code completely." ON
"ITK_WRAPPING" OFF)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @thewtex

Wrapping/Generators/SwigInterface/CMakeLists.txt Outdated Show resolved Hide resolved
Modules/Core/Common/include/itkExtractImageFilter.h
@@ -137,7 +137,7 @@ class ITK_TEMPLATE_EXPORT ExtractImageFilter : public InPlaceImageFilter<TInputI
/** Backwards compatibility for enum values */
using DIRECTIONCOLLAPSESTRATEGY = ExtractImageFilterCollapseStrategy;
using DirectionCollapseStrategyEnum = ExtractImageFilterCollapseStrategy;
#if !defined(ITK_LEGACY_REMOVE) || defined(ITK_WRAPPING) /* castxml 'enum class' workaround */
#if !defined(ITK_LEGACY_REMOVE)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yippee! I'm delighted that this hack can now be removed.

dzenanz
dzenanz approved these changes Dec 4, 2019
View reviewed changes
Copy link
Member

@dzenanz dzenanz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code looks good, I will test it locally.

Wrapping/Generators/SwigInterface/CMakeLists.txt Outdated Show resolved Hide resolved
dzenanz
dzenanz approved these changes Dec 4, 2019
View reviewed changes
Copy link
Member

@dzenanz dzenanz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That wrapping step is no longer a blocker. I do have some already known errors (#1381) and possibly new warnings:

In project ITKGPUAnisotropicSmoothingPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6437: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::Image< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >'. Ignored.
In project ITKGPUAnisotropicSmoothingTestDriver, file C:\Dev\ITK-2017\Modules\Filtering\GPUAnisotropicSmoothing\test\itkGPUGradientAnisotropicDiffusionImageFilterTest.obj, line 1: Error LNK2019: unresolved external symbol "public: static char const * __cdecl itk::GPUDenseFiniteDifferenceImageFilterKernel::GetOpenCLSource(void)" (?GetOpenCLSource@GPUDenseFiniteDifferenceImageFilterKernel@itk@@SAPEBDXZ) referenced in function "public: static char const * __cdecl itk::GPUDenseFiniteDifferenceImageFilter<class itk::GPUImage<float,2>,class itk::GPUImage<float,2>,class itk::GradientAnisotropicDiffusionImageFilter<class itk::GPUImage<float,2>,class itk::GPUImage<float,2> > >::GetOpenCLSource(void)" (?GetOpenCLSource@?$GPUDenseFiniteDifferenceImageFilter@V?$GPUImage@M$01@itk@@V12@V?$GradientAnisotropicDiffusionImageFilter@V?$GPUImage@M$01@itk@@V12@@2@@itk@@SAPEBDXZ)
In project ITKGPUAnisotropicSmoothingTestDriver, file C:\Dev\ITK-2017\bin\Debug\ITKGPUAnisotropicSmoothingTestDriver.exe, line 1: Error LNK1120: 1 unresolved externals
In project ITKGPUPDEDeformableRegistrationTestDriver, file C:\Dev\ITK-2017\Modules\Registration\GPUPDEDeformable\test\itkGPUDemonsRegistrationFilterTest.obj, line 1: Error LNK2019: unresolved external symbol "public: static char const * __cdecl itk::GPUDenseFiniteDifferenceImageFilterKernel::GetOpenCLSource(void)" (?GetOpenCLSource@GPUDenseFiniteDifferenceImageFilterKernel@itk@@SAPEBDXZ) referenced in function "public: static char const * __cdecl itk::GPUDenseFiniteDifferenceImageFilter<class itk::GPUImage<class itk::Vector<float,2>,2>,class itk::GPUImage<class itk::Vector<float,2>,2>,class itk::DemonsRegistrationFilter<class itk::GPUImage<float,2>,class itk::GPUImage<float,2>,class itk::GPUImage<class itk::Vector<float,2>,2> > >::GetOpenCLSource(void)" (?GetOpenCLSource@?$GPUDenseFiniteDifferenceImageFilter@V?$GPUImage@V?$Vector@M$01@itk@@$01@itk@@V12@V?$DemonsRegistrationFilter@V?$GPUImage@M$01@itk@@V12@V?$GPUImage@V?$Vector@M$01@itk@@$01@2@@2@@itk@@SAPEBDXZ)
In project ITKGPUPDEDeformableRegistrationTestDriver, file C:\Dev\ITK-2017\Modules\Registration\GPUPDEDeformable\test\itkGPUDemonsRegistrationFilterTest2.obj, line 1: Error LNK2001: unresolved external symbol "public: static char const * __cdecl itk::GPUDenseFiniteDifferenceImageFilterKernel::GetOpenCLSource(void)" (?GetOpenCLSource@GPUDenseFiniteDifferenceImageFilterKernel@itk@@SAPEBDXZ)
In project ITKGPUPDEDeformableRegistrationTestDriver, file C:\Dev\ITK-2017\bin\Debug\ITKGPUPDEDeformableRegistrationTestDriver.exe, line 1: Error LNK1120: 1 unresolved externals
In project ITKGPUFiniteDifferencePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4589: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >'. Ignored.
In project ITKGPUFiniteDifferencePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4589: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >' using %template.
In project ITKGPUFiniteDifferencePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4633: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::Image< unsigned long long,2 > >'. Ignored.
In project ITKGPUFiniteDifferencePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4633: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::Image< unsigned long long,2 > >' using %template.
In project ITKGPUFiniteDifferencePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4677: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >'. Ignored.
In project ITKGPUFiniteDifferencePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4677: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >' using %template.
In project ITKGPUFiniteDifferencePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4721: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::Image< unsigned long long,3 > >'. Ignored.
In project ITKGPUFiniteDifferencePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4721: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::Image< unsigned long long,3 > >' using %template.
In project ITKGPUFiniteDifferencePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6437: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::Image< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >'. Ignored.
In project ITKGPUFiniteDifferencePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6437: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::Image< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >' using %template.
In project ITKGPUFiniteDifferencePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6481: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::Image< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >'. Ignored.
In project ITKGPUFiniteDifferencePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6481: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::Image< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >' using %template.
In project ITKGPUFiniteDifferencePython, file C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Microsoft\VC\v150\Microsoft.CppCommon.targets, line 209: Error MSB6006: "cmd.exe" exited with code 12.
In project ITKGPUImageFilterBasePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4589: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >'. Ignored.
In project ITKGPUImageFilterBasePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4589: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >' using %template.
In project ITKGPUImageFilterBasePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4633: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::Image< unsigned long long,2 > >'. Ignored.
In project ITKGPUImageFilterBasePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4633: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::Image< unsigned long long,2 > >' using %template.
In project ITKGPUImageFilterBasePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4677: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >'. Ignored.
In project ITKGPUImageFilterBasePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4677: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >' using %template.
In project ITKGPUImageFilterBasePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4721: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::Image< unsigned long long,3 > >'. Ignored.
In project ITKGPUImageFilterBasePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4721: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::Image< unsigned long long,3 > >' using %template.
In project ITKGPUImageFilterBasePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6437: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::Image< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >'. Ignored.
In project ITKGPUImageFilterBasePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6437: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::Image< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >' using %template.
In project ITKGPUImageFilterBasePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6481: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::Image< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >'. Ignored.
In project ITKGPUImageFilterBasePython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6481: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::Image< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >' using %template.
In project ITKGPUImageFilterBasePython, file C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Microsoft\VC\v150\Microsoft.CppCommon.targets, line 209: Error MSB6006: "cmd.exe" exited with code 12.
In project ITKGPUCommonPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4589: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >'. Ignored.
In project ITKGPUCommonPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4589: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >' using %template.
In project ITKGPUCommonPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4633: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::Image< unsigned long long,2 > >'. Ignored.
In project ITKGPUCommonPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4633: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::Image< unsigned long long,2 > >' using %template.
In project ITKGPUCommonPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4677: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >'. Ignored.
In project ITKGPUCommonPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4677: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >' using %template.
In project ITKGPUCommonPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4721: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::Image< unsigned long long,3 > >'. Ignored.
In project ITKGPUCommonPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4721: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::Image< unsigned long long,3 > >' using %template.
In project ITKGPUCommonPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6437: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::Image< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >'. Ignored.
In project ITKGPUCommonPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6437: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::Image< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >' using %template.
In project ITKGPUCommonPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6481: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::Image< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >'. Ignored.
In project ITKGPUCommonPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6481: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::Image< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >' using %template.
In project ITKGPUCommonPython, file C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Microsoft\VC\v150\Microsoft.CppCommon.targets, line 209: Error MSB6006: "cmd.exe" exited with code 12.
In project ITKGPUAnisotropicSmoothingPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4589: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >'. Ignored.
In project ITKGPUAnisotropicSmoothingPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4589: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >' using %template.
In project ITKGPUAnisotropicSmoothingPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4633: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::Image< unsigned long long,2 > >'. Ignored.
In project ITKGPUAnisotropicSmoothingPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4633: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,2 >,itk::Image< unsigned long long,2 > >' using %template.
In project ITKGPUAnisotropicSmoothingPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4677: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >'. Ignored.
In project ITKGPUAnisotropicSmoothingPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4677: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >' using %template.
In project ITKGPUAnisotropicSmoothingPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4721: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::Image< unsigned long long,3 > >'. Ignored.
In project ITKGPUAnisotropicSmoothingPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 4721: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::GPUImage< unsigned long long,3 >,itk::Image< unsigned long long,3 > >' using %template.
In project ITKGPUAnisotropicSmoothingPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6437: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::Image< unsigned long long,2 >,itk::GPUImage< unsigned long long,2 > >' using %template.
In project ITKGPUAnisotropicSmoothingPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6481: Warning 401: Nothing known about base class 'itk::ImageToImageFilter< itk::Image< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >'. Ignored.
In project ITKGPUAnisotropicSmoothingPython, file C:\Dev\ITK-2017\Wrapping\Typedefs\itkGPUInPlaceImageFilter.i, line 6481: Warning 401: Maybe you forgot to instantiate 'itk::ImageToImageFilter< itk::Image< unsigned long long,3 >,itk::GPUImage< unsigned long long,3 > >' using %template.
In project ITKGPUAnisotropicSmoothingPython, file C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Microsoft\VC\v150\Microsoft.CppCommon.targets, line 209: Error MSB6006: "cmd.exe" exited with code 12.
In project ITKCommonPython, file c:\dev\itk-git\modules\thirdparty\vnl\src\vxl\core\vnl\vnl_vector.h, line 173: Warning C4146: unary minus operator applied to unsigned type, result still unsigned

It is fine if these warnings get addressed in a subsequent PR.

Wrapping/Generators/SwigInterface/CMakeLists.txt
@@ -13,15 +13,11 @@ find_package(PythonInterp REQUIRED)
###############################################################################
# Build swig

option(ITK_USE_SYSTEM_SWIG "Use system swig. If OFF, swig is built as an external project." ${ITK_USE_SYSTEM_LIBRARIES})
option(ITK_USE_SYSTEM_SWIG "Use system swig. If OFF, swig is built as an external project." OFF)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit could be squashed with the first one before merging.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 squashed

@dzenanz
Copy link
Member

dzenanz commented Dec 4, 2019

I forgot to mention that I rebased on current master before compiling locally.

@thewtex
COMP: Update SWIG to 4.0.1 for Windows build
b93534c 
Addresses:

  cmd.exe /C "cd /D C:\src\ITK-Release\Wrapping\Typedefs\python && C:\src\ITK-Release\Wrapping\Generators\SwigInterface\swigwin-3.0.12\swig.exe -c++ -python -O -features autodoc=1 -py3 -Werror -w302 -w303 -w312 -w314 -w361 -w362 -w350 -w383 -w384 -w389 -w394 -w395 -w467 -w508 -w509 -o C:/src/ITK-Release/Wrapping/Modules/ITKOptimizers/ITKOptimizersBasePython.cpp -IC:/src/ITK-Release/Wrapping/Generators/SwigInterface/swig/share/swig/3.0.12/python -IC:/src/ITK-Release/Wrapping/Generators/SwigInterface/swig/share/swig/3.0.12 -IC:/src/ITK/Wrapping/Generators -IC:/src/ITK-Release/Wrapping/Typedefs/python -IC:/src/ITK-Release/Wrapping/Typedefs -outdir C:/src/ITK-Release/lib C:/src/ITK-Release/Wrapping/Typedefs/ITKOptimizersBase.i"
Assertion failed: Getattr(n, "sym:name"), file Modules/lang.cxx, line 1657

Since many current stable Linux distributions provide 3.X by default,
have ITK_USE_SYSTEM_SWIG default to OFF.

4.0.1 also provides:

- Python Sphinx compatibility added for Doxygen comments.
- Support for Doxygen documentation comments which are parsed and converted into JavaDoc or PyDoc comments.
- C++11 STL containers added for Java, Python and Ruby.
- Improved support for parsing C++11 and C++14 code
- Python module overhaul by simplifying the generated code and turning most optimizations on by default.
@thewtex
ENH: Enable ITK_LEGACY_REMOVE when wrapping is enabled
971501e 
So we do not wrap legacy methods.

Restores intended behavior removed in 35865ca
@thewtex
COMP: Do not avoid legacy enum definitions when wrapping
f6c193b 
This workaround was not necessary.
@thewtex thewtex merged commit 06c9d72 into InsightSoftwareConsortium:master Dec 4, 2019
@thewtex thewtex deleted the windows-wrapping branch December 4, 2019 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hjmjohnson hjmjohnson hjmjohnson approved these changes

@dzenanz dzenanz dzenanz approved these changes

@aylward aylward Awaiting requested review from aylward

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@thewtex @dzenanz @hjmjohnson