From 872a86dbdd49e29ca736f92ee6a18b7660ee94ea Mon Sep 17 00:00:00 2001
From: Stefan Eilemann <Stefan.Eilemann@epfl.ch>
Date: Mon, 28 Jul 2014 11:31:40 +0200
Subject: [PATCH 1/2] COMP: Fix build on RHEL6 PPC

Change-Id: Iff644ab35fa71a9d0dda0feb0619267092d08290
---
 .../KWSys/src/KWSys/SystemInformation.cxx      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Modules/ThirdParty/KWSys/src/KWSys/SystemInformation.cxx b/Modules/ThirdParty/KWSys/src/KWSys/SystemInformation.cxx
index 720a7c3b0df..8bb8ee9899b 100644
--- a/Modules/ThirdParty/KWSys/src/KWSys/SystemInformation.cxx
+++ b/Modules/ThirdParty/KWSys/src/KWSys/SystemInformation.cxx
@@ -88,15 +88,6 @@ typedef int siginfo_t;
 #  include <ifaddrs.h>
 #  define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
 # endif
-# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
-#  include <execinfo.h>
-#  if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
-#    include <cxxabi.h>
-#  endif
-#  if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
-#    include <dlfcn.h>
-#  endif
-# endif
 #endif
 
 #if defined(__OpenBSD__) || defined(__NetBSD__)
@@ -107,6 +98,15 @@ typedef int siginfo_t;
 #if defined(KWSYS_SYS_HAS_MACHINE_CPU_H)
 # include <machine/cpu.h>
 #endif
+#if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
+# include <execinfo.h>
+#endif
+#if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
+# include <cxxabi.h>
+#endif
+#if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
+# include <dlfcn.h>
+#endif
 
 #if defined(__DragonFly__)
 # include <sys/sysctl.h>

From d8d11cbf299287a712a9f3c139c90b1b487a5beb Mon Sep 17 00:00:00 2001
From: Stefan Eilemann <Stefan.Eilemann@epfl.ch>
Date: Wed, 30 Jul 2014 13:37:43 +0200
Subject: [PATCH 2/2] ENH: Allow disable of default modules

Change-Id: Iafe453cf935cca34b0c7a8d8b14e35af1b22bbf5
---
 CMake/ITKModuleMacros.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMake/ITKModuleMacros.cmake b/CMake/ITKModuleMacros.cmake
index c32a29eda33..2a76d56c70e 100644
--- a/CMake/ITKModuleMacros.cmake
+++ b/CMake/ITKModuleMacros.cmake
@@ -27,7 +27,6 @@ macro(itk_module _name)
   set(ITK_MODULE_${itk-module}_DEPENDS "")
   set(ITK_MODULE_${itk-module-test}_DEPENDS "${itk-module}")
   set(ITK_MODULE_${itk-module}_DESCRIPTION "description")
-  set(ITK_MODULE_${itk-module}_EXCLUDE_FROM_DEFAULT 0)
   set(ITK_MODULE_${itk-module}_ENABLE_SHARED 0)
   foreach(arg ${ARGN})
     if("${arg}" MATCHES "^(DEPENDS|TEST_DEPENDS|DESCRIPTION|DEFAULT)$")