code_patches/v2018.04.2/SRC_BASE.patch at 3a0b13b18d77813cdb059c5216f7d2ee79e02587 · OpenHeartDevelopers/code_patches · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
diff --git a/Applications/AppList.cmake b/Applications/AppList.cmake
index 96d4a8abb8..7383d69b3c 100644
--- a/Applications/AppList.cmake
+++ b/Applications/AppList.cmake
@@ -3,7 +3,7 @@
 # allow early dependency checking

 option(MITK_BUILD_APP_CoreApp "Build the MITK CoreApp" OFF)
-option(MITK_BUILD_APP_Workbench "Build the MITK Workbench executable" ON)
+option(MITK_BUILD_APP_Workbench "Build the MITK Workbench executable" OFF)
 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
+++ b/Plugins/org.blueberry.core.jobs/src/internal/berryJobManager.cpp
@@ -459,6 +459,7 @@ void JobManager::ChangeState(InternalJob::Pointer sptr_job, int newState)
     case Job::SLEEPING:
       m_JobQueueSleeping.Remove(sptr_job);
       // assert(false, "Tried to remove a job that wasn't in the queue");
+      break;

     case Job::RUNNING:
     case InternalJob::ABOUT_TO_RUN: