Updates to build system.

cjh1 · Apr 7, 2012 · 63d637e · 63d637e
1 parent 2a355fe
commit 63d637e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/modular/CMake/VTKModuleMacros.cmake b/modular/CMake/VTKModuleMacros.cmake
@@ -30,7 +30,7 @@ macro(vtk_module _name)
       set(_doing "")
       set(VTK_MODULE_${vtk-module}_EXCLUDE_FROM_WRAPPING 1)
     elseif("${arg}" MATCHES "^[A-Z][A-Z][A-Z]$" AND
-           NOT "${arg}" MATCHES "^(ON|OFF)$")
+           NOT "${arg}" MATCHES "^(ON|OFF|MPI)$")
       set(_doing "")
       message(AUTHOR_WARNING "Unknown argument [${arg}]")
     elseif("${_doing}" MATCHES "^DEPENDS$")
@@ -197,7 +197,7 @@ macro(vtk_target_name _name)
     set(_vtk "")
   else()
     set(_vtk "vtk")
-    message(AUTHOR_WARNING "Target [${_name}] does not start in 'vtk'.")
+    #message(AUTHOR_WARNING "Target [${_name}] does not start in 'vtk'.")
   endif()
   set_property(TARGET ${_name} PROPERTY OUTPUT_NAME ${_vtk}${_name}-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION})
 endmacro()

diff --git a/modular/FiltersParallel.patch b/modular/FiltersParallel.patch
@@ -0,0 +1,13 @@
+diff --git a/Filters/Parallel/vtkBlockDistribution.h b/Filters/Parallel/vtkBlockDistribution.h
+index 199669c..3377aaf 100644
+--- a/Filters/Parallel/vtkBlockDistribution.h
++++ b/Filters/Parallel/vtkBlockDistribution.h
+@@ -25,7 +25,7 @@
+ #ifndef __vtkBlockDistribution_h
+ #define __vtkBlockDistribution_h
+
+-class VTK_PARALLEL_EXPORT vtkBlockDistribution
++class vtkBlockDistribution
+ {
+ public:
+   // Description:
diff --git a/modular/Rendering/OpenGL/CMakeLists.txt b/modular/Rendering/OpenGL/CMakeLists.txt
@@ -6,6 +6,7 @@ set(VTK_USE_X_DEFAULT OFF)
 if(APPLE)
   option(VTK_USE_COCOA "Use Cocoa for VTK render windows" ON)
   option(VTK_USE_CARBON "Use Carbon for VTK render windows" OFF)
+  mark_as_advanced(VTK_USE_COCOA VTK_USE_CARBON)
   if(VTK_USE_COCOA AND VTK_USE_CARBON)
     message(FATAL_ERROR "You can't enable Carbon and Cocoa - you must choose one.")
   endif()
@@ -125,6 +126,7 @@ elseif(APPLE)
   set(VTK_USE_APPLE_LOADER 1)
   find_package(ApplicationServices)
   find_package(IOKit)
+  mark_as_advanced(ApplicationServices IOKit)
   if(ApplicationServices_FOUND AND IOKit_FOUND)
     set(VTK_USE_CORE_GRAPHICS 1)
   endif()

diff --git a/modular/Views/Geovis/module.cmake b/modular/Views/Geovis/module.cmake
@@ -1,6 +1,4 @@
 vtk_module(vtkViewsGeovis
-  GROUPS
-    StandAlone
   DEPENDS
     vtkViewsInfovis
     vtkGeovisCore

diff --git a/modular/manifest.txt b/modular/manifest.txt
@@ -788,8 +788,8 @@ Common/Testing/Tcl/TestString.tcl:
 Common/Testing/Tcl/otherInterp.tcl:
 Common/Testing/Tcl/otherPrint.tcl:
 
-modular/CommonCore.patch: <ignore>
-<patch>: CommonCore.patch
+modular/CommonCoreTcl.patch: <ignore>
+<patch>: CommonCoreTcl.patch
 
 [Common/ComputationalGeometry]
 
@@ -6716,6 +6716,9 @@ Parallel/vtkPYoungsMaterialInterface.h:
 Parallel/vtkPMaskPoints.cxx:
 Parallel/vtkPMaskPoints.h:
 
+modular/FiltersParallel.patch: <ignore>
+<patch>: FiltersParallel.patch
+
 [Filters/Parallel/Testing/Cxx]
 Parallel/Testing/Cxx/DistributedData.cxx:
 Parallel/Testing/Cxx/DistributedDataRenderPass.cxx: