macOS changes

v2018.04.2/SRC_BASE.patch

@@ -11,6 +11,45 @@ index 96d4a8abb8..7383d69b3c 100644
  option(MITK_BUILD_APP_Diffusion "Build the MITK Diffusion executable" OFF)
 
  # This variable is fed to ctkFunctionSetupPlugins() macro in the
+diff --git a/CMake/mitkFunctionCreateModule.cmake b/CMake/mitkFunctionCreateModule.cmake
+index ce984559eb..1301840198 100644
+--- a/CMake/mitkFunctionCreateModule.cmake
++++ b/CMake/mitkFunctionCreateModule.cmake
+@@ -350,7 +350,7 @@ function(mitk_create_module)
+ 	# reactivated after https://gitlab.kitware.com/cmake/cmake/issues/17904 has been fixed.
+         # mitkFunctionCheckCAndCXXCompilerFlags("/w34100" module_c_flags module_cxx_flags)
+       else()
+-        mitkFunctionCheckCAndCXXCompilerFlags(-Werror module_c_flags module_cxx_flags)
++        mitkFunctionCheckCAndCXXCompilerFlags(-Wno-error module_c_flags module_cxx_flags)
+
+         # The flag "c++0x-static-nonintegral-init" has been renamed in newer Clang
+         # versions to "static-member-init", see
+diff --git a/CMake/mitkFunctionCreatePlugin.cmake b/CMake/mitkFunctionCreatePlugin.cmake
+index 1c5faf618e..4c2f60e8fa 100644
+--- a/CMake/mitkFunctionCreatePlugin.cmake
++++ b/CMake/mitkFunctionCreatePlugin.cmake
+@@ -207,7 +207,7 @@ function(mitk_create_plugin)
+     if(MSVC_VERSION)
+       mitkFunctionCheckCAndCXXCompilerFlags("/WX" plugin_c_flags plugin_cxx_flags)
+     else()
+-      mitkFunctionCheckCAndCXXCompilerFlags(-Werror plugin_c_flags plugin_cxx_flags)
++      mitkFunctionCheckCAndCXXCompilerFlags(-Wno-error plugin_c_flags plugin_cxx_flags)
+       mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=c++0x-static-nonintegral-init" plugin_c_flags plugin_cxx_flags)
+       mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=static-member-init" plugin_c_flags plugin_cxx_flags)
+       mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=unknown-warning" plugin_c_flags plugin_cxx_flags)
+diff --git a/Modules/CppMicroServices/CMakeLists.txt b/Modules/CppMicroServices/CMakeLists.txt
+index afcc73d72e..3a3363fcea 100644
+--- a/Modules/CppMicroServices/CMakeLists.txt
++++ b/Modules/CppMicroServices/CMakeLists.txt
+@@ -169,7 +169,7 @@ endif()
+
+ # Set C++ compiler flags
+ if(NOT MSVC)
+-  foreach(_cxxflag  -Werror -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align
++  foreach(_cxxflag  -Wno-error -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align
+                     -Wwrite-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast
+                     -Wstrict-null-sentinel -Wsign-promo -fdiagnostics-show-option)
+     usFunctionCheckCompilerFlags(${_cxxflag} US_CXX_FLAGS)
 diff --git a/Plugins/org.blueberry.core.jobs/src/internal/berryJobManager.cpp b/Plugins/org.blueberry.core.jobs/src/internal/berryJobManager.cpp
 index 507bf6ab28..92421a018f 100644
 --- a/Plugins/org.blueberry.core.jobs/src/internal/berryJobManager.cpp

v2018.04.2/SRC_BASE_MACOS.patch

@@ -42,3 +42,18 @@ index 8bbe3a2d8a..581d281ed8 100644
 
    struct ServiceListenerCompare : std::binary_function<US_SERVICE_LISTENER_FUNCTOR, US_SERVICE_LISTENER_FUNCTOR, bool>
    {
+diff --git a/Utilities/IpPic/mitkIpPic.h b/Utilities/IpPic/mitkIpPic.h
+index 0cc63aa766..4e16191c1e 100644
+--- a/Utilities/IpPic/mitkIpPic.h
++++ b/Utilities/IpPic/mitkIpPic.h
+@@ -231,9 +231,7 @@
+ #include <stdio.h>
+ #include <string.h>
+
+-#ifdef sun
+-#  include <unistd.h>
+-#endif
++#include <unistd.h>
+
+
+