4e85dc18b2
- updated to 5.8.0 OBS-URL: https://build.opensuse.org/request/show/87721 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=25
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
Index: VTK/CMakeLists.txt
|
|
===================================================================
|
|
--- VTK.orig/CMakeLists.txt
|
|
+++ VTK/CMakeLists.txt
|
|
@@ -126,6 +126,11 @@ IF(CMAKE_CONFIGURATION_TYPES)
|
|
ENDIF(CMAKE_CONFIGURATION_TYPES)
|
|
|
|
#-----------------------------------------------------------------------------
|
|
+# 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)
|
|
+
|
|
+#-----------------------------------------------------------------------------
|
|
# Load some macros.
|
|
INCLUDE(vtkDependentOption)
|
|
INCLUDE(vtkThirdParty)
|
|
Index: VTK/CMake/vtkThirdParty.cmake
|
|
===================================================================
|
|
--- VTK.orig/CMake/vtkThirdParty.cmake
|
|
+++ VTK/CMake/vtkThirdParty.cmake
|
|
@@ -1,6 +1,6 @@
|
|
#-----------------------------------------------------------------------------
|
|
MACRO(VTK_THIRD_PARTY_OPTION upper lower)
|
|
- OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." OFF)
|
|
+ OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." ${VTK_USE_SYSTEM_LIBRARIES})
|
|
MARK_AS_ADVANCED(VTK_USE_SYSTEM_${upper})
|
|
IF(VTK_USE_SYSTEM_${upper})
|
|
IF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
|
|
Index: VTK/Rendering/CMakeLists.txt
|
|
===================================================================
|
|
--- VTK.orig/Rendering/CMakeLists.txt
|
|
+++ VTK/Rendering/CMakeLists.txt
|
|
@@ -207,7 +207,8 @@ ENDIF (NOT VTK_LEGACY_REMOVE)
|
|
|
|
IF(VTK_USE_GL2PS)
|
|
SET(Kit_SRCS ${Kit_SRCS} vtkGL2PSExporter.cxx)
|
|
-
|
|
+ OPTION(VTK_USE_SYSTEM_GL2PS "Use the system's gl2ps library." ${VTK_USE_SYSTEM_LIBRARIES})
|
|
+ MARK_AS_ADVANCED(VTK_USE_SYSTEM_GL2PS)
|
|
IF(VTK_USE_SYSTEM_GL2PS)
|
|
ELSE(VTK_USE_SYSTEM_GL2PS)
|
|
SET(Kit_GL2PS_SRCS ${VTK_SOURCE_DIR}/Utilities/vtkgl2ps/gl2ps.c)
|