30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
|
diff --git a/CMake/vtkModuleMacros.cmake b/CMake/vtkModuleMacros.cmake
|
||
|
|
index 3e746a6..9ef38fd 100644
|
||
|
|
--- a/CMake/vtkModuleMacros.cmake
|
||
|
|
+++ b/CMake/vtkModuleMacros.cmake
|
||
|
|
@@ -563,7 +563,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})
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 0d1dda8..b3e1801 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -97,6 +97,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_INSTALL_INCLUDE_DIR})
|
||
|
|
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)
|
||
|
|
|