Small fix to CMake module for detecting SCOTCH.
Merge branch 'garth/fix-scotch-detection' into next
Small fix so NUMPY defines get included when compiling SWIG modules
Merge branch 'johanhake/fix-swig-common-include' into next