]>
Commit | Line | Data |
---|---|---|
8d833c50 | 1 | diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt |
62573659 JR |
2 | --- VTK/CMakeLists.txt.system 2012-12-03 08:31:29.000000000 -0700 |
3 | +++ VTK/CMakeLists.txt 2012-12-06 09:58:22.809749444 -0700 | |
4 | @@ -97,6 +97,11 @@ set(VTK_INSTALL_INCLUDE_DIR_CM24 ${VTK_I | |
5 | set(VTK_INSTALL_DOXYGEN_DIR_CM24 ${VTK_INSTALL_DATA_DIR}/doxygen) | |
8d833c50 JR |
6 | |
7 | #----------------------------------------------------------------------------- | |
8 | +# Do we try to use system libraries by default? | |
9 | +OPTION(VTK_USE_SYSTEM_LIBRARIES "Use the system's libraries by default." OFF) | |
10 | +MARK_AS_ADVANCED(VTK_USE_SYSTEM_LIBRARIES) | |
11 | + | |
12 | +#----------------------------------------------------------------------------- | |
62573659 JR |
13 | # The third party macros are still used in one or two third party builds. |
14 | include(vtkThirdParty) | |
15 | ||
16 | diff -up VTK/CMake/vtkModuleMacros.cmake.system VTK/CMake/vtkModuleMacros.cmake | |
17 | --- VTK/CMake/vtkModuleMacros.cmake.system 2012-12-03 08:31:29.000000000 -0700 | |
18 | +++ VTK/CMake/vtkModuleMacros.cmake 2012-12-06 09:58:22.810749439 -0700 | |
19 | @@ -563,7 +563,7 @@ macro(vtk_module_third_party _pkg) | |
20 | message(FATAL_ERROR "Cannot specify both LIBRARIES and NO_LIBRARIES") | |
21 | endif() | |
22 | ||
23 | - option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" OFF) | |
24 | + option(VTK_USE_SYSTEM_${_upper} "Use system-installed ${_pkg}" ${VTK_USE_SYSTEM_LIBRARIES}) | |
25 | mark_as_advanced(VTK_USE_SYSTEM_${_upper}) | |
26 | ||
27 | if(VTK_USE_SYSTEM_${_upper}) |