40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt
|
|
--- VTK/CMakeLists.txt.system 2010-09-27 14:40:00.000000000 -0600
|
|
+++ VTK/CMakeLists.txt 2011-02-08 14:08:29.367122550 -0700
|
|
@@ -106,6 +106,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)
|
|
diff -up VTK/CMake/vtkThirdParty.cmake.system VTK/CMake/vtkThirdParty.cmake
|
|
--- VTK/CMake/vtkThirdParty.cmake.system 2010-09-27 14:40:00.000000000 -0600
|
|
+++ VTK/CMake/vtkThirdParty.cmake 2011-02-08 14:07:46.424662568 -0700
|
|
@@ -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)
|
|
diff -up VTK/Rendering/CMakeLists.txt.system VTK/Rendering/CMakeLists.txt
|
|
--- VTK/Rendering/CMakeLists.txt.system 2010-09-27 14:40:06.000000000 -0600
|
|
+++ VTK/Rendering/CMakeLists.txt 2011-02-08 14:11:47.379633170 -0700
|
|
@@ -202,7 +202,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)
|