]>
Commit | Line | Data |
---|---|---|
ed317954 JR |
1 | diff --git a/CMake/vtkModuleMacros.cmake b/CMake/vtkModuleMacros.cmake |
2 | index 3e746a6..9ef38fd 100644 | |
3 | --- a/CMake/vtkModuleMacros.cmake | |
4 | +++ b/CMake/vtkModuleMacros.cmake | |
5 | @@ -563,7 +563,7 @@ macro(vtk_module_third_party _pkg) | |
6 | message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES") | |
7 | endif() | |
8 | ||
9 | - option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF) | |
10 | + option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES}) | |
11 | mark_as_advanced(VTK_USE_SYSTEM_${_upper}) | |
12 | ||
13 | if(VTK_USE_SYSTEM_${_upper}) | |
14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | |
15 | index 0d1dda8..b3e1801 100644 | |
16 | --- a/CMakeLists.txt | |
17 | +++ b/CMakeLists.txt | |
18 | @@ -97,6 +97,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_INSTALL_INCLUDE_DIR}) | |
19 | set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen) | |
57a21a1b JR |
20 | |
21 | #----------------------------------------------------------------------------- | |
22 | +# Do we try to use system libraries by default? | |
23 | +OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF) | |
24 | +MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES) | |
25 | + | |
26 | +#----------------------------------------------------------------------------- | |
ed317954 JR |
27 | # The third party macros are still used in one or two third party builds. |
28 | include(vtkThirdParty) | |
29 |