412a42290d
Update to version 6.1.0 with appropriate packaging changes. OBS-URL: https://build.opensuse.org/request/show/220546 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=46
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
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
|
|
@@ -132,6 +132,11 @@ if (CMAKE_CROSSCOMPILING AND NOT COMPILE
|
|
endif()
|
|
|
|
#-----------------------------------------------------------------------------
|
|
+# 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)
|
|
|