openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File vtk-system.patch of Package vtk (Revision 184ab62e88d44d5e00d4dd7d2b5d2205)

Currently displaying revision 184ab62e88d44d5e00d4dd7d2b5d2205 , Show latest

Index: VTK6.0.0/CMake/vtkModuleMacros.cmake
===================================================================
--- VTK6.0.0.orig/CMake/vtkModuleMacros.cmake
+++ VTK6.0.0/CMake/vtkModuleMacros.cmake
@@ -613,7 +613,7 @@ macro(vtk_module_third_party _pkg)
     message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES")
   endif()
 
-  option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF)
+  option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES})
   mark_as_advanced(VTK_USE_SYSTEM_${_upper})
 
   if(VTK_USE_SYSTEM_${_upper})
Index: VTK6.0.0/CMakeLists.txt
===================================================================
--- VTK6.0.0.orig/CMakeLists.txt
+++ VTK6.0.0/CMakeLists.txt
@@ -107,6 +107,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I
 set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen)
 
 #-----------------------------------------------------------------------------
+# Do we try to use system libraries by default?
+OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF)
+MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES)
+
+#-----------------------------------------------------------------------------
 # The third party macros are still used in one or two third party builds.
 include(vtkThirdParty)

Places

File vtk-system.patch of Package vtk (Revision 184ab62e88d44d5e00d4dd7d2b5d2205)

Places