Commit 98ae0f96 authored by David Partyka's avatar David Partyka
Browse files

Merge branch 'forwarding-executable-macro' into release

parents 0125d72f 9d85fcfd
......@@ -254,6 +254,9 @@ IF(NOT VTK_INSTALL_JAVA_DIR)
SET(VTK_INSTALL_JAVA_DIR ${VTK_INSTALL_PACKAGE_DIR}/java)
ENDIF(NOT VTK_INSTALL_JAVA_DIR)
OPTION(VTK_INSTALL_THIRD_PARTY_LIBRARIES "Use fixup bundle to install vtk and vtkpython dependencies." OFF)
MARK_AS_ADVANCED(VTK_INSTALL_THIRD_PARTY_LIBRARIES)
# There are three basic components to the VTK installation: runtime,
# development, and documentation. Install rules for each component
# are surrounded by blockers. Parent projects or users can specify
......@@ -267,18 +270,6 @@ ENDIF(NOT VTK_INSTALL_JAVA_DIR)
# decision here.
SET(VTK_INSTALL_NO_LIBRARIES)
IF(NOT DEFINED VTK_INSTALL_DEVELOPMENT)
SET(VTK_INSTALL_DEVELOPMENT ON CACHE BOOL "Install headers, link libraries and other files used for development" FORCE )
ENDIF()
IF(NOT DEFINED VTK_INSTALL_NO_DEVELOPMENT)
IF(VTK_INSTALL_DEVELOPMENT)
SET(VTK_INSTALL_NO_DEVELOPMENT OFF)
ELSE()
SET(VTK_INSTALL_NO_DEVELOPMENT ON)
ENDIF()
ENDIF()
IF(BUILD_SHARED_LIBS)
IF(VTK_INSTALL_NO_RUNTIME AND VTK_INSTALL_NO_DEVELOPMENT)
SET(VTK_INSTALL_NO_LIBRARIES ON)
......@@ -1516,8 +1507,10 @@ IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
COMPONENT Development)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
# Install rules for fixing up vtkpython
ADD_SUBDIRECTORY(Utilities/Release)
# Use fixup_bundle to pull in vtk and vtkpython dependencies
IF(VTK_INSTALL_THIRD_PARTY_LIBRARIES)
ADD_SUBDIRECTORY(Utilities/Release)
ENDIF()
# Setup CPack
INCLUDE(VTKCPack.cmake)
......
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