projects / packages / vtk.git / blame
| Commit | Line | Data |
|---|---|---|
| 57a21a1b JR |
1 | diff -up VTK/CMakeLists.txt.system VTK/CMakeLists.txt |
| 2 | --- VTK/CMakeLists.txt.system 2010-09-27 14:40:00.000000000 -0600 | |
| 3 | +++ VTK/CMakeLists.txt 2011-02-08 14:08:29.367122550 -0700 | |
| 4 | @@ -106,6 +106,11 @@ IF(CMAKE_CONFIGURATION_TYPES) | |
| 5 | ENDIF(CMAKE_CONFIGURATION_TYPES) | |
| 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 | +#----------------------------------------------------------------------------- | |
| 13 | # Load some macros. | |
| 14 | INCLUDE(vtkDependentOption) | |
| 15 | INCLUDE(vtkThirdParty) | |
| 16 | diff -up VTK/CMake/vtkThirdParty.cmake.system VTK/CMake/vtkThirdParty.cmake | |
| 17 | --- VTK/CMake/vtkThirdParty.cmake.system 2010-09-27 14:40:00.000000000 -0600 | |
| 18 | +++ VTK/CMake/vtkThirdParty.cmake 2011-02-08 14:07:46.424662568 -0700 | |
| 19 | @@ -1,6 +1,6 @@ | |
| 20 | #----------------------------------------------------------------------------- | |
| 21 | MACRO(VTK_THIRD_PARTY_OPTION upper lower) | |
| 22 | - OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." OFF) | |
| 23 | + OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." ${VTK_USE_SYSTEM_LIBRARIES}) | |
| 24 | MARK_AS_ADVANCED(VTK_USE_SYSTEM_${upper}) | |
| 25 | IF(VTK_USE_SYSTEM_${upper}) | |
| 26 | IF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake) |