From cdcb843ef43cb9bcb3725e6b6b82479ea891f449 Mon Sep 17 00:00:00 2001 From: kgv Date: Sat, 27 Mar 2021 15:48:37 +0300 Subject: [PATCH] 0032251: Documentation, gendoc.tcl - reference manual excludes TKIVtk and other optional modules gendoc.tcl -refman now temporarily sets HAVE_ environment variables for including optional modules. --- adm/gendoc.tcl | 16 ++++++++++++++++ src/OS/Draw.tcl | 10 ++++------ src/OS/Visualization.tcl | 10 ++++------ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/adm/gendoc.tcl b/adm/gendoc.tcl index 19eb10a973..3ee5fd142f 100644 --- a/adm/gendoc.tcl +++ b/adm/gendoc.tcl @@ -686,6 +686,17 @@ proc OCCDoc_MakeDoxyfile {docType outDir tagFileDir {doxyFileName} {generatorMod # Write specific options if { $docType == "REFMAN" } { + # always include optional components + set aHaveD3dBack "" + set aHaveGlesBack "" + set aHaveVtkBack "" + if { [info exists ::env(HAVE_D3D)] } { set aHaveD3dBack "$::env(HAVE_D3D)" } + if { [info exists ::env(HAVE_GLES2)] } { set aHaveGlesBack "$::env(HAVE_GLES2)" } + if { [info exists ::env(HAVE_VTK)] } { set aHaveVtkBack "$::env(HAVE_VTK)" } + set ::env(HAVE_D3D) "true" + set ::env(HAVE_GLES2) "true" + set ::env(HAVE_VTK) "true" + # Load lists of modules scripts if { $productsPath == "" } { set modules_scripts [glob -nocomplain -type f -directory "[OCCDoc_GetSourceDir $productsPath]/OS/" *.tcl] @@ -811,6 +822,11 @@ proc OCCDoc_MakeDoxyfile {docType outDir tagFileDir {doxyFileName} {generatorMod puts $doxyFile "" + # restore environment variables + set ::env(HAVE_D3D) "$aHaveD3dBack" + set ::env(HAVE_GLES2) "$aHaveGlesBack" + set ::env(HAVE_VTK) "$aHaveVtkBack" + } elseif { $docType == "OVERVIEW" } { # Add common options for generation of Overview and User Guides diff --git a/src/OS/Draw.tcl b/src/OS/Draw.tcl index a72770b69e..786ff58584 100644 --- a/src/OS/Draw.tcl +++ b/src/OS/Draw.tcl @@ -21,15 +21,13 @@ proc Draw:toolkits { } { if { [info exists ::env(HAVE_GLES2)] && "$::env(HAVE_GLES2)" == "true" } { lappend aResult "TKOpenGlesTest" } - if { "$::tcl_platform(platform)" == "windows" } { - if { [info exists ::env(HAVE_D3D)] } { - if { "$::env(HAVE_D3D)" == "true" } { - lappend aResult "TKD3DHostTest" - } - } elseif { [info exists ::env(VCVER)] && "$::env(VCVER)" != "vc8" && "$::env(VCVER)" != "vc9" && "$::env(VCVER)" != "vc10" } { + + if { [info exists ::env(HAVE_D3D)] } { + if { "$::env(HAVE_D3D)" == "true" } { lappend aResult "TKD3DHostTest" } } + if { [info exists ::env(HAVE_VTK)] && "$::env(HAVE_VTK)" == "true" } { lappend aResult "TKIVtkDraw" } diff --git a/src/OS/Visualization.tcl b/src/OS/Visualization.tcl index cf881b5ca7..7a17efff81 100644 --- a/src/OS/Visualization.tcl +++ b/src/OS/Visualization.tcl @@ -21,15 +21,13 @@ proc Visualization:toolkits { } { if { [info exists ::env(HAVE_GLES2)] && "$::env(HAVE_GLES2)" == "true" } { lappend aResult "TKOpenGles" } - if { "$::tcl_platform(platform)" == "windows" } { - if { [info exists ::env(HAVE_D3D)] } { - if { "$::env(HAVE_D3D)" == "true" } { - lappend aResult "TKD3DHost" - } - } elseif { [info exists ::env(VCVER)] && "$::env(VCVER)" != "vc8" && "$::env(VCVER)" != "vc9" && "$::env(VCVER)" != "vc10" } { + + if { [info exists ::env(HAVE_D3D)] } { + if { "$::env(HAVE_D3D)" == "true" } { lappend aResult "TKD3DHost" } } + if { [info exists ::env(HAVE_VTK)] && "$::env(HAVE_VTK)" == "true" } { lappend aResult "TKIVtk" }