Commit c9ad1402 authored by Ken Martin's avatar Ken Martin
Browse files

merge from main tree

parent 70160306
......@@ -13,6 +13,7 @@ ENDIF(VTK_BUILD_SETTINGS_FILE)
# Add compiler flags needed to use VTK.
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${VTK_REQUIRED_C_FLAGS}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VTK_REQUIRED_CXX_FLAGS}")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${VTK_REQUIRED_EXE_LINKER_FLAGS}")
# Add include directories needed to use VTK.
INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
......@@ -21,8 +22,7 @@ INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
LINK_DIRECTORIES(${VTK_LIBRARY_DIRS})
# Import the VTK_LOAD_CMAKE_EXTENSIONS macro.
INCLUDE(${VTK_CMAKE_EXTENSIONS_DIR}/vtkLoadCMakeExtensions.cmake)
INCLUDE(${VTK_LOAD_CMAKE_EXTENSIONS_MACRO})
# Compile the extensions into the build tree and load them.
VTK_LOAD_CMAKE_EXTENSIONS(${VTK_CMAKE_EXTENSIONS_DIR}
${PROJECT_BINARY_DIR}/CMakeVTK)
# Load VTK's CMake extension commands.
VTK_LOAD_CMAKE_EXTENSIONS(${VTK_CMAKE_EXTENSIONS_DIR})
......@@ -14,6 +14,7 @@ SET(VTK_LIBRARY_DIRS "@VTK_LIBRARY_DIRS_CONFIG@")
# The C and C++ flags added by VTK to the cmake-configured flags.
SET(VTK_REQUIRED_C_FLAGS "@VTK_REQUIRED_C_FLAGS@")
SET(VTK_REQUIRED_CXX_FLAGS "@VTK_REQUIRED_CXX_FLAGS@")
SET(VTK_REQUIRED_EXE_LINKER_FLAGS "@VTK_REQUIRED_EXE_LINKER_FLAGS@")
# The VTK version number
SET(VTK_MAJOR_VERSION "@VTK_MAJOR_VERSION@")
......@@ -26,7 +27,11 @@ SET(VTK_USE_FILE "@VTK_USE_FILE@")
# The build settings file.
SET(VTK_BUILD_SETTINGS_FILE "@VTK_BUILD_SETTINGS_FILE@")
# CMake extension module directory.
# The wrapping hints file.
SET(VTK_WRAP_HINTS "@VTK_WRAP_HINTS_CONFIG@")
# CMake extension module directory and macro file.
SET(VTK_LOAD_CMAKE_EXTENSIONS_MACRO "@VTK_LOAD_CMAKE_EXTENSIONS_MACRO_CONFIG@")
SET(VTK_CMAKE_EXTENSIONS_DIR "@VTK_CMAKE_EXTENSIONS_DIR_CONFIG@")
# The list of available kits.
......
......@@ -26,6 +26,9 @@ SET(VTK_USE_FILE ${VTK_BINARY_DIR}/UseVTK.cmake)
# The build settings file.
SET(VTK_BUILD_SETTINGS_FILE ${VTK_BINARY_DIR}/VTKBuildSettings.cmake)
# The wrapping hints file.
SET(VTK_WRAP_HINTS_CONFIG ${VTK_WRAP_HINTS})
# Library directory.
SET(VTK_LIBRARY_DIRS_CONFIG ${LIBRARY_OUTPUT_PATH})
......@@ -77,7 +80,9 @@ ELSE(VTK_RENDERING_NEED_TK_INTERNAL)
ENDIF(VTK_RENDERING_NEED_TK_INTERNAL)
# CMake extension module directory.
SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${VTK_SOURCE_DIR}/CMake)
SET(VTK_LOAD_CMAKE_EXTENSIONS_MACRO_CONFIG
"${VTK_SOURCE_DIR}/CMake/vtkLoadCMakeExtensions.cmake")
SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${VTK_BINARY_DIR}/CMake)
# Library dependencies file.
SET(VTK_LIBRARY_DEPENDS_FILE "${VTK_BINARY_DIR}/VTKLibraryDepends.cmake")
......@@ -113,6 +118,12 @@ SET(VTK_USE_FILE ${CMAKE_INSTALL_PREFIX}/lib/vtk/UseVTK.cmake)
# The build settings file.
SET(VTK_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/lib/vtk/VTKBuildSettings.cmake)
# The wrapping hints file.
IF(VTK_WRAP_HINTS)
GET_FILENAME_COMPONENT(VTK_HINTS_FNAME ${VTK_WRAP_HINTS} NAME)
SET(VTK_WRAP_HINTS_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/${VTK_HINTS_FNAME})
ENDIF(VTK_WRAP_HINTS)
# Include directories.
SET(VTK_INCLUDE_DIRS_CONFIG
${CMAKE_INSTALL_PREFIX}/include/vtk
......@@ -178,7 +189,9 @@ ENDIF(VTK_RENDERING_NEED_TK_INTERNAL AND TK_INTERNAL_PATH)
SET(VTK_TK_INTERNAL_ROOT_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtk)
# CMake extension module directory.
# CMake extension module directory and macro file.
SET(VTK_LOAD_CMAKE_EXTENSIONS_MACRO_CONFIG
"${CMAKE_INSTALL_PREFIX}/lib/vtk/CMake/vtkLoadCMakeExtensions.cmake")
SET(VTK_CMAKE_EXTENSIONS_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/lib/vtk/CMake)
# Library dependencies file.
......
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