Commit 59808f6c authored by Brad King's avatar Brad King 💬
Browse files

ENH: Cleanup to reduce cache entries presented to the user.

parent 9769f888
......@@ -8,8 +8,13 @@ MACRO(VTK_THIRD_PARTY_OPTION upper lower)
ELSE(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
INCLUDE(${VTK_SOURCE_DIR}/CMake/Find${upper}.cmake)
ENDIF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
MARK_AS_ADVANCED(${upper}_INCLUDE_DIR ${upper}_LIBRARY)
IF(${upper}_FOUND)
SET(VTK_${upper}_LIBRARIES ${${upper}_LIBRARIES})
IF("${upper}" MATCHES "^PNG$")
SET(PNG_INCLUDE_DIR ${PNG_PNG_INCLUDE_DIR})
MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR)
ENDIF("${upper}" MATCHES "^PNG$")
ELSE(${upper}_FOUND)
MESSAGE(SEND_ERROR "VTK_USE_SYSTEM_${upper} is ON, but ${upper}_LIBRARY is NOTFOUND.")
ENDIF(${upper}_FOUND)
......
......@@ -358,6 +358,10 @@ ENDIF(VTK_USE_RENDERING)
# Configure Mangled MESA support.
IF(VTK_USE_MANGLED_MESA)
INCLUDE(${VTK_SOURCE_DIR}/CMake/FindMangledMesa.cmake)
MARK_AS_ADVANCED(MANGLED_MESA_INCLUDE_DIR MANGLED_MESA_LIBRARY
MANGLED_OSMESA_INCLUDE_DIR MANGLED_OSMESA_LIBRARY)
IF(MANGLED_MESA_INCLUDE_DIR)
USE_MANGLED_MESA(${MANGLED_MESA_INCLUDE_DIR}/GL
${VTK_BINARY_DIR}/MangleMesaInclude)
......@@ -368,6 +372,7 @@ ENDIF(VTK_USE_MANGLED_MESA)
# Configure Off-Screen MESA support.
IF(VTK_OPENGL_HAS_OSMESA)
INCLUDE(${VTK_SOURCE_DIR}/CMake/FindOSMesa.cmake)
MARK_AS_ADVANCED(OSMESA_INCLUDE_DIR OSMESA_LIBRARY)
ENDIF(VTK_OPENGL_HAS_OSMESA)
#-----------------------------------------------------------------------------
......@@ -423,7 +428,17 @@ ENDIF(VTK_USE_PARALLEL)
# Configure Tcl wrapping support.
IF(VTK_WRAP_TCL)
INCLUDE(${CMAKE_ROOT}/Modules/FindTCL.cmake)
MARK_AS_ADVANCED(TK_WISH TCL_LIBRARY_DEBUG TK_LIBRARY_DEBUG)
# Hide useless settings provided by FindTCL.
FOREACH(entry TCL_LIBRARY_DEBUG
TK_LIBRARY_DEBUG
TCL_STUB_LIBRARY
TCL_STUB_LIBRARY_DEBUG
TK_STUB_LIBRARY
TK_STUB_LIBRARY_DEBUG
TK_WISH)
SET(${entry} "${${entry}}" CACHE INTERNAL "This value is not used by VTK.")
ENDFOREACH(entry)
# Wrapping executables.
UTILITY_SOURCE(VTK_WRAP_TCL_EXE vtkWrapTcl Wrapping vtkWrapTcl.c)
......
......@@ -165,8 +165,9 @@ CONFIGURE_FILE(${VTKFTGL_SOURCE_DIR}/vtkftglConfig.h.in
# Build examples (testing purposes)
# (Warning, they use Glut)
#
OPTION (FTGL_BUILD_EXAMPLES "Build FTGL examples (warning: you need Glut)" OFF)
MARK_AS_ADVANCED (FTGL_BUILD_EXAMPLES)
#OPTION (FTGL_BUILD_EXAMPLES "Build FTGL examples (warning: you need Glut)" OFF)
#MARK_AS_ADVANCED (FTGL_BUILD_EXAMPLES)
SET(FTGL_BUILD_EXAMPLES 0)
IF (FTGL_BUILD_EXAMPLES)
......
......@@ -19,14 +19,14 @@ IF(VTK_USE_CARBON)
ENDIF(VTK_USE_CARBON)
FIND_LIBRARY(UTIL_LIBRARY
FIND_LIBRARY(PYTHON_UTIL_LIBRARY
NAMES util
PATHS /usr/lib
DOC "Utility library needed for vtkpython"
)
IF(UTIL_LIBRARY)
SET(UTIL_LIBRARY_LIB ${UTIL_LIBRARY})
ENDIF(UTIL_LIBRARY)
IF(PYTHON_UTIL_LIBRARY)
SET(PYTHON_UTIL_LIBRARY_LIB ${PYTHON_UTIL_LIBRARY})
ENDIF(PYTHON_UTIL_LIBRARY)
IF (APPLE)
......@@ -41,7 +41,7 @@ TARGET_LINK_LIBRARIES(vtkpython
vtkIO
vtkGraphics
vtkImaging
${UTIL_LIBRARY_LIB})
${PYTHON_UTIL_LIBRARY_LIB})
IF (VTK_USE_RENDERING)
TARGET_LINK_LIBRARIES(vtkpython vtkRendering)
......@@ -83,7 +83,7 @@ IF (VTK_USE_PARALLEL)
vtkGraphics
vtkImaging
vtkParallel
${UTIL_LIBRARY_LIB}
${PYTHON_UTIL_LIBRARY_LIB}
)
IF (VTK_USE_PATENTED)
TARGET_LINK_LIBRARIES(pvtkpython vtkPatented)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment