An update will be applied January 25th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit 55da3080 authored by Dave DeMarle's avatar Dave DeMarle
Browse files

Merge branch 'tcl_link_new_libs' into release

Change-Id: Icc6ae55f7830ac0f82191c264aea798805ff18b4
parents f8a94f70 ad5d0445
......@@ -95,6 +95,18 @@ IF (VTK_USE_VIEWS)
TARGET_LINK_LIBRARIES(vtk vtkViewsTCL)
ENDIF (VTK_USE_VIEWS)
IF (VTK_USE_CHARTS)
TARGET_LINK_LIBRARIES(vtk vtkChartsTCL)
ENDIF (VTK_USE_CHARTS)
IF (VTK_USE_CHEMISTRY)
TARGET_LINK_LIBRARIES(vtk vtkChemistryTCL)
ENDIF (VTK_USE_CHEMISTRY)
IF (VTK_USE_TEXT_ANALYSIS)
TARGET_LINK_LIBRARIES(vtk vtkTextAnalysisTCL)
ENDIF (VTK_USE_TEXT_ANALYSIS)
# Link to extra TCL libraries
FOREACH(lib ${VTK_EXTRA_TCL_LIBRARIES})
TARGET_LINK_LIBRARIES(vtk ${lib})
......@@ -184,6 +196,18 @@ IF (VTK_USE_PARALLEL)
TARGET_LINK_LIBRARIES(pvtk vtkViewsTCL)
ENDIF (VTK_USE_VIEWS)
IF (VTK_USE_CHARTS)
TARGET_LINK_LIBRARIES(pvtk vtkChartsTCL)
ENDIF (VTK_USE_CHARTS)
IF (VTK_USE_CHEMISTRY)
TARGET_LINK_LIBRARIES(pvtk vtkChemistryTCL)
ENDIF (VTK_USE_CHEMISTRY)
IF (VTK_USE_TEXT_ANALYSIS)
TARGET_LINK_LIBRARIES(pvtk vtkTextAnalysisTCL)
ENDIF (VTK_USE_TEXT_ANALYSIS)
IF(NOT VTK_INSTALL_NO_RUNTIME)
INSTALL(TARGETS pvtk
EXPORT ${VTK_INSTALL_EXPORT_NAME}
......@@ -225,6 +249,9 @@ SET(VTK_TCL_PARALLEL_CONFIG "")
SET(VTK_TCL_GEOVIS_CONFIG "")
SET(VTK_TCL_INFOVIS_CONFIG "")
SET(VTK_TCL_VIEWS_CONFIG "")
SET(VTK_TCL_CHARTS_CONFIG "")
SET(VTK_TCL_CHEMISTRY_CONFIG "")
SET(VTK_TCL_TEXTANALYSIS_CONFIG "")
IF (VTK_USE_PARALLEL)
SET(VTK_TCL_PARALLEL_CONFIG "Parallel")
......@@ -246,6 +273,21 @@ IF (VTK_USE_VIEWS)
ADD_SUBDIRECTORY(vtkviews)
ENDIF (VTK_USE_VIEWS)
IF (VTK_USE_CHARTS)
SET(VTK_TCL_CHARTS_CONFIG "Charts")
ADD_SUBDIRECTORY(vtkcharts)
ENDIF (VTK_USE_CHARTS)
IF (VTK_USE_CHEMISTRY)
SET(VTK_TCL_CHEMISTRY_CONFIG "Chemistry")
ADD_SUBDIRECTORY(vtkchemistry)
ENDIF (VTK_USE_CHEMISTRY)
IF (VTK_USE_TEXT_ANALYSIS)
SET(VTK_TCL_TEXTANALYSIS_CONFIG "TextAnalysis")
ADD_SUBDIRECTORY(vtktextanalysis)
ENDIF (VTK_USE_TEXT_ANALYSIS)
IF (VTK_USE_RENDERING)
SET(VTK_TCL_WIDGETS_CONFIG "Widgets")
ADD_SUBDIRECTORY(vtkwidgets)
......
......@@ -25,7 +25,9 @@ package ifneeded vtkinit {@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@} {
@VTK_TCL_RENDERING_CONFIG@ @VTK_TCL_VOLUMERENDERING_CONFIG@
@VTK_TCL_HYBRID_CONFIG@ @VTK_TCL_WIDGETS_CONFIG@
@VTK_TCL_PARALLEL_CONFIG@ @VTK_TCL_GEOVIS_CONFIG@
@VTK_TCL_INFOVIS_CONFIG@ @VTK_TCL_VIEWS_CONFIG@} {
@VTK_TCL_INFOVIS_CONFIG@ @VTK_TCL_VIEWS_CONFIG@
@VTK_TCL_CHARTS_CONFIG@ @VTK_TCL_CHEMISTRY_CONFIG@
@VTK_TCL_TEXTANALYSIS_CONFIG@} {
lappend kits [string tolower "${kit}"]
}
}
......@@ -36,7 +38,9 @@ foreach kit { Common Filtering IO Imaging Graphics
@VTK_TCL_RENDERING_CONFIG@ @VTK_TCL_VOLUMERENDERING_CONFIG@
@VTK_TCL_HYBRID_CONFIG@ @VTK_TCL_WIDGETS_CONFIG@
@VTK_TCL_PARALLEL_CONFIG@ @VTK_TCL_GEOVIS_CONFIG@
@VTK_TCL_INFOVIS_CONFIG@ @VTK_TCL_VIEWS_CONFIG@} {
@VTK_TCL_INFOVIS_CONFIG@ @VTK_TCL_VIEWS_CONFIG@
@VTK_TCL_CHARTS_CONFIG@ @VTK_TCL_CHEMISTRY_CONFIG@
@VTK_TCL_TEXTANALYSIS_CONFIG@} {
package ifneeded "vtk${kit}TCL" {@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@} "
package require -exact vtkinit {@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@}
::vtk::init::load_library_package {vtk${kit}TCL} {@VTK_TCL_LIBRARY_DIR@}
......
......@@ -215,6 +215,18 @@ extern "C" int Vtkinfovistcl_Init(Tcl_Interp *interp);
extern "C" int Vtkviewstcl_Init(Tcl_Interp *interp);
#endif
#ifdef VTK_USE_CHARTS
extern "C" int Vtkchartstcl_Init(Tcl_Interp *interp);
#endif
#ifdef VTK_USE_CHEMISTRY
extern "C" int Vtkchemistrytcl_Init(Tcl_Interp *interp);
#endif
#ifdef VTK_USE_TEXT_ANALYSIS
extern "C" int Vtktextanalysistcl_Init(Tcl_Interp *interp);
#endif
void help()
{
}
......@@ -328,6 +340,27 @@ int Tcl_AppInit(Tcl_Interp *interp)
return TCL_ERROR;
}
#endif
#ifdef VTK_USE_CHARTS
if (Vtkchartstcl_Init(interp) == TCL_ERROR)
{
return TCL_ERROR;
}
#endif
#ifdef VTK_USE_CHEMISTRY
if (Vtkchemistrytcl_Init(interp) == TCL_ERROR)
{
return TCL_ERROR;
}
#endif
#ifdef VTK_USE_TEXT_ANALYSIS
if (Vtktextanalysistcl_Init(interp) == TCL_ERROR)
{
return TCL_ERROR;
}
#endif
#ifdef VTK_EXTRA_TCL_INIT
VTK_EXTRA_TCL_INIT;
......
IF(NOT VTK_INSTALL_NO_RUNTIME)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/vtkcharts.tcl.in
${CMAKE_CURRENT_BINARY_DIR}/vtkcharts.tcl
@ONLY)
INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/vtkcharts.tcl
DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtkcharts
COMPONENT RuntimeLibraries)
ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
package require -exact vtkwidgets @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
if {[info commands ::vtk::init::require_package] != ""} {
if {[::vtk::init::require_package vtkChartsTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
package provide vtkcharts @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
}
} else {
if {[info commands vtkChartMatrix] != "" ||
[::vtk::load_component vtkChartsTCL] == ""} {
package provide vtkcharts @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
}
}
IF(NOT VTK_INSTALL_NO_RUNTIME)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/vtkchemistry.tcl.in
${CMAKE_CURRENT_BINARY_DIR}/vtkchemistry.tcl
@ONLY)
INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/vtkchemistry.tcl
DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/chemistry
COMPONENT RuntimeLibraries)
ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
package require -exact vtkrendering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
if {[info commands ::vtk::init::require_package] != ""} {
if {[::vtk::init::require_package vtkChemistryTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
package provide vtkchemistry @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
}
} else {
if {[info commands vtkPeriodTable] != "" ||
[::vtk::load_component vtkChemistryTCL] == ""} {
package provide vtkchemistry @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
}
}
IF(NOT VTK_INSTALL_NO_RUNTIME)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/vtktextanalysis.tcl.in
${CMAKE_CURRENT_BINARY_DIR}/vtktextanalysis.tcl
@ONLY)
INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/vtktextanalysis.tcl
DESTINATION ${VTK_TCL_INSTALL_DIR_CM24}/vtktextanalysis
COMPONENT RuntimeLibraries)
ENDIF(NOT VTK_INSTALL_NO_RUNTIME)
package require -exact vtkrendering @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
if {[info commands ::vtk::init::require_package] != ""} {
if {[::vtk::init::require_package vtkTextAnalysisTCL @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@]} {
package provide vtktextanalysis @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
}
} else {
if {[info commands vtkTextExtraction] != "" ||
[::vtk::load_component vtkTextAnalysisTCL] == ""} {
package provide vtktextanalysis @VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION@
}
}
......@@ -20,6 +20,8 @@
/*--------------------------------------------------------------------------*/
/* Selected VTK Toolkits */
#cmakedefine VTK_USE_CHARTS
#cmakedefine VTK_USE_CHEMISTRY
#cmakedefine VTK_USE_VIEWS
#cmakedefine VTK_USE_GEOVIS
#cmakedefine VTK_USE_INFOVIS
......
Markdown is supported
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