Revision: 77609
http://sourceforge.net/p/brlcad/code/77609
Author: starseeker
Date: 2020-10-23 14:49:29 +0000 (Fri, 23 Oct 2020)
Log Message:
-----------
Update lists for distcheck-repo_verify, remove unused toplevel ThirdParty
modules, update INSTALL and configure files (stepcode isn't showing up in them,
need to track down why)
Modified Paths:
--------------
brlcad/branches/extbuild/INSTALL
brlcad/branches/extbuild/configure
brlcad/branches/extbuild/misc/CMake/CMakeLists.txt
brlcad/branches/extbuild/src/other/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/bson.cmake
brlcad/branches/extbuild/src/other/ext/bson.dist
brlcad/branches/extbuild/src/other/ext/gdal.cmake
brlcad/branches/extbuild/src/other/ext/gdal.dist
brlcad/branches/extbuild/src/other/ext/itcl.cmake
brlcad/branches/extbuild/src/other/ext/itcl3.dist
brlcad/branches/extbuild/src/other/ext/itk.cmake
brlcad/branches/extbuild/src/other/ext/itk3.dist
brlcad/branches/extbuild/src/other/ext/iwidgets.cmake
brlcad/branches/extbuild/src/other/ext/iwidgets.dist
brlcad/branches/extbuild/src/other/ext/netpbm.cmake
brlcad/branches/extbuild/src/other/ext/netpbm.dist
brlcad/branches/extbuild/src/other/ext/openscenegraph.dist
brlcad/branches/extbuild/src/other/ext/perplex.cmake
brlcad/branches/extbuild/src/other/ext/png.cmake
brlcad/branches/extbuild/src/other/ext/png.dist
brlcad/branches/extbuild/src/other/ext/proj-4.dist
brlcad/branches/extbuild/src/other/ext/proj4.cmake
brlcad/branches/extbuild/src/other/ext/regex.cmake
brlcad/branches/extbuild/src/other/ext/regex.dist
brlcad/branches/extbuild/src/other/ext/stepcode.cmake
brlcad/branches/extbuild/src/other/ext/stepcode.dist
brlcad/branches/extbuild/src/other/ext/tcl.cmake
brlcad/branches/extbuild/src/other/ext/tcl.dist
brlcad/branches/extbuild/src/other/ext/tk.cmake
brlcad/branches/extbuild/src/other/ext/tk.dist
brlcad/branches/extbuild/src/other/ext/zlib.cmake
brlcad/branches/extbuild/src/other/ext/zlib.dist
Added Paths:
-----------
brlcad/branches/extbuild/src/other/ext/perplex.dist
Removed Paths:
-------------
brlcad/branches/extbuild/misc/CMake/ThirdParty.cmake
brlcad/branches/extbuild/misc/CMake/ThirdParty_TCL.cmake
Modified: brlcad/branches/extbuild/INSTALL
===================================================================
--- brlcad/branches/extbuild/INSTALL 2020-10-23 14:14:03 UTC (rev 77608)
+++ brlcad/branches/extbuild/INSTALL 2020-10-23 14:49:29 UTC (rev 77609)
@@ -444,71 +444,16 @@
Aliases: ENABLE_DOCS, ENABLE_EXTRA_DOCS, ENABLE_DOCBOOK
---- BRLCAD_LEMON ---
+--- BRLCAD_ZLIB ---
-Option for enabling and disabling compilation of the lemon parser
+Option for enabling and disabling compilation of the zlib library
provided with BRL-CAD's source distribution. Default is AUTO,
responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
-Aliases: ENABLE_LEMON
+Aliases: ENABLE_ZLIB, ENABLE_LIBZ
---- BRLCAD_RE2C ---
-
-Option for enabling and disabling compilation of the re2c scanner
-utility provided with BRL-CAD's source distribution. Default is AUTO,
-responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
-first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
-
-Aliases: ENABLE_RE2C
-
-
---- BRLCAD_PERPLEX ---
-
-Option for enabling and disabling compilation of the perplex scanner
-generator provided with BRL-CAD's source distribution. Default is
-AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
-testing first for a system version if BRLCAD_BUNDLED_LIBS is also
-AUTO. perplex requires a working re2c.
-
-Aliases: ENABLE_PERPLEX
-
-
---- BRLCAD_ASTYLE ---
-
-Option for enabling and disabling compilation of the Artistic Style
-(astyle) utility provided with BRL-CAD's source distribution. Default is
-AUTO,
-responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
-first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
-
-Aliases: ENABLE_ASTYLE
-
-
---- BRLCAD_XSLTPROC ---
-
-Option for enabling and disabling compilation of the xsltproc XML
-transformation utility provided with BRL-CAD's source distribution.
-Used for DocBook documentation processing. Default is AUTO,
-responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
-first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
-Depends on BRLCAD_EXTRADOCS.
-
-Aliases: ENABLE_XSLTPROC
-
-
---- BRLCAD_XMLLINT ---
-
-Option for enabling and disabling compilation of the xmllint XML
-validation utility provided with BRL-CAD's source distribution. Used
-for DocBook documentation validation. Default is AUTO, responsive to
-the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
-version if BRLCAD_BUNDLED_LIBS is also AUTO.
-
-Aliases: ENABLE_XMLLINT
-
-
--- BRLCAD_REGEX ---
Option for enabling and disabling compilation of the Regular
@@ -520,14 +465,14 @@
Aliases: ENABLE_REGEX
---- BRLCAD_ZLIB ---
+--- BRLCAD_NETPBM ---
-Option for enabling and disabling compilation of the zlib library
-provided with BRL-CAD's source distribution. Default is AUTO,
-responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
-first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
+Option for enabling and disabling compilation of the netpbm library
+provided with BRL-CAD's source code. Default is AUTO, responsive to
+the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
+version if BRLCAD_BUNDLED_LIBS is also AUTO.
-Aliases: ENABLE_ZLIB, ENABLE_LIBZ
+Aliases: ENABLE_NETPBM
--- BRLCAD_PNG ---
@@ -541,24 +486,26 @@
Aliases: ENABLE_PNG
---- BRLCAD_NETPBM ---
+--- BRLCAD_PROJ4 ---
-Option for enabling and disabling compilation of the netpbm library
-provided with BRL-CAD's source code. Default is AUTO, responsive to
-the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
-version if BRLCAD_BUNDLED_LIBS is also AUTO.
+Option for enabling and disabling compilation of the PROJ.4 geographic
+projection library provided with BRL-CAD's source code. Default
+is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
+testing first for a system version if BRLCAD_BUNDLED_LIBS is also
+AUTO.
-Aliases: ENABLE_NETPBM
+Aliases: ENABLE_PROJ4
---- BRLCAD_UTAHRLE ---
+--- BRLCAD_GDAL ---
-Option for enabling and disabling compilation of the Utah Raster
-Toolkit library provided with BRL-CAD's source code. Default is AUTO,
-responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
-first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
+Option for enabling and disabling compilation of the GDAL geographic
+library provided with BRL-CAD's source code. Default
+is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
+testing first for a system version if BRLCAD_BUNDLED_LIBS is also
+AUTO.
-Aliases: ENABLE_UTAHRLE
+Aliases: ENABLE_GDAL
--- BRLCAD_TCL ---
@@ -571,139 +518,41 @@
Aliases: ENABLE_TCL
---- BRLCAD_TK ---
+--- BRLCAD_ASTYLE ---
-Option for enabling and disabling compilation of the Tk library
-provided with BRL-CAD's source code. Default is AUTO, responsive to
-the BRLCAD_TCL option and testing first for a system version if
-BRLCAD_BUNDLED_LIBS is also AUTO. Option for enabling and disabling
-compilation of the Tk graphics package for Tcl provided with BRL-CAD's
-source distribution. Default is AUTO, auto-enabling if the BRLCAD_TCL
-option is set to BUNDLED and testing first for a system version if
-BRLCAD_TCL is set to AUTO or SYSTEM. If BRLCAD_TK is set to BUNDLED,
-local copy is built even if a system version is present. This option
-also depends on BRLCAD_ENABLE_TK being ON.
+Option for enabling and disabling compilation of the Artistic Style
+(astyle) utility provided with BRL-CAD's source distribution. Default is
+AUTO,
+responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
+first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
-Aliases: ENABLE_TK
+Aliases: ENABLE_ASTYLE
---- BRLCAD_ITCL ---
+--- BRLCAD_XSLTPROC ---
-Option for enabling and disabling compilation of the IncrTcl package
-for Tcl objects provided with BRL-CAD's source distribution. Default
-is AUTO, auto-enabling if the BRLCAD_TCL option is set to BUNDLED and
-testing first for a system version if BRLCAD_TCL is set to AUTO or
-SYSTEM. If BRLCAD_ITCL is set to BUNDLED, local copy is built even if
-a system version is present.
-
-Aliases: ENABLE_ITCL
-
-
---- BRLCAD_ITK ---
-
-Option for enabling and disabling compilation of the IncrTcl itk
-package for Tk objects provided with BRL-CAD's source distribution.
-Default is AUTO, auto-enabling if the BRLCAD_TCL option is set to
-BUNDLED and testing first for a system version if BRLCAD_TCL is set to
-AUTO or SYSTEM. If BRLCAD_ITK is set to BUNDLED, local copy is built
-even if a system version is present. This package will be disabled if
-BRLCAD_ENABLE_TK is OFF.
-
-Aliases: ENABLE_ITK
-
-
---- BRLCAD_IWIDGETS ---
-
-Option for enabling and disabling compilation of the IWidgets Tk
-widget package provided with BRL-CAD's source distribution. Default
-is AUTO, auto-enabling if the BRLCAD_TCL option is set to BUNDLED and
-testing first for a system version if BRLCAD_TCL is set to AUTO or
-SYSTEM. If BRLCAD_IWIDGETS is set to BUNDLED, local copy is built even if
-a system version is present. This package will be disabled if
-BRLCAD_ENABLE_TK is OFF.
-
-Aliases: ENABLE_IWIDGETS
-
-
---- BRLCAD_TKHTML ---
-
-Option for enabling and disabling compilation of the Tkhtml HTML
-viewing package provided with BRL-CAD's source distribution. Default
-is AUTO, auto-enabling if the BRLCAD_TCL option is set to BUNDLED and
-testing first for a system version if BRLCAD_TCL is set to AUTO or
-SYSTEM. If BRLCAD_TKHTML is set to BUNDLED, local copy is built even if
-a system version is present. This package will be disabled if
-BRLCAD_ENABLE_TK is OFF.
-
-Aliases: ENABLE_TKHTML
-
-
---- BRLCAD_TKTABLE ---
-
-Option for enabling and disabling compilation of the Tktable graphical
-table widget package provided with BRL-CAD's source distribution.
-Default is AUTO, auto-enabling if the BRLCAD_TCL option is set to
-BUNDLED and testing first for a system version if BRLCAD_TCL is set to
-AUTO or SYSTEM. If BRLCAD_TKTABLE is set to BUNDLED, local copy is built
-even if a system version is present. This package will be disabled if
-BRLCAD_ENABLE_TK is OFF.
-
-Aliases: ENABLE_TKTABLE
-
-
---- BRLCAD_OPENNURBS ---
-
-Option for enabling and disabling compilation of the openNURBS library
-provided with BRL-CAD's source code. Default is AUTO, responsive to
-the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
-version if BRLCAD_BUNDLED_LIBS is also AUTO.
-
-Aliases: ENABLE_OPENNURBS
-
-
---- BRLCAD_SC ---
-
-Option for enabling and disabling compilation of the NIST Step Class
-Libraries provided with BRL-CAD's source code. Default is AUTO,
+Option for enabling and disabling compilation of the xsltproc XML
+transformation utility provided with BRL-CAD's source distribution.
+Used for DocBook documentation processing. Default is AUTO,
responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
+Depends on BRLCAD_EXTRADOCS.
-Aliases: ENABLE_SCL, ENABLE_STEP, ENABLE_STEP_CLASS_LIBRARIES
+Aliases: ENABLE_XSLTPROC
---- BRLCAD_OSG ---
+--- BRLCAD_XMLLINT ---
-Option for enabling and disabling compilation of the OpenSceneGraph
-libraries provided with BRL-CAD's source code. Default is AUTO, responsive to
+Option for enabling and disabling compilation of the xmllint XML
+validation utility provided with BRL-CAD's source distribution. Used
+for DocBook documentation validation. Default is AUTO, responsive to
the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
version if BRLCAD_BUNDLED_LIBS is also AUTO.
-Aliases: ENABLE_OPENSCENEGRAPH
+Aliases: ENABLE_XMLLINT
---- BRLCAD_PROJ4 ---
-Option for enabling and disabling compilation of the PROJ.4 geographic
-projection library provided with BRL-CAD's source code. Default
-is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
-testing first for a system version if BRLCAD_BUNDLED_LIBS is also
-AUTO.
-
-Aliases: ENABLE_PROJ4
-
-
---- BRLCAD_GDAL ---
-
-Option for enabling and disabling compilation of the GDAL geographic
-library provided with BRL-CAD's source code. Default
-is AUTO, responsive to the toplevel BRLCAD_BUNDLED_LIBS option and
-testing first for a system version if BRLCAD_BUNDLED_LIBS is also
-AUTO.
-
-Aliases: ENABLE_GDAL
-
-
-
*** Note - Do not add or edit configuration option descriptions and alias
lists in this file - those entries are auto-generated from information in
the toplevel CMakeLists.txt file and src/other/CMakeLists.txt - any changes
Modified: brlcad/branches/extbuild/configure
===================================================================
--- brlcad/branches/extbuild/configure 2020-10-23 14:14:03 UTC (rev 77608)
+++ brlcad/branches/extbuild/configure 2020-10-23 14:49:29 UTC (rev 77609)
@@ -82,110 +82,50 @@
shift;;
--disable-docbook) options="$options
-DBRLCAD_EXTRADOCS=OFF";
shift;;
- --enable-lemon) options="$options -DBRLCAD_LEMON=BUNDLED";
+ --enable-zlib) options="$options -DBRLCAD_ZLIB=BUNDLED";
shift;;
- --disable-lemon) options="$options -DBRLCAD_LEMON=SYSTEM";
+ --disable-zlib) options="$options -DBRLCAD_ZLIB=SYSTEM";
shift;;
- --enable-re2c) options="$options -DBRLCAD_RE2C=BUNDLED";
+ --enable-libz) options="$options -DBRLCAD_ZLIB=BUNDLED";
shift;;
- --disable-re2c) options="$options -DBRLCAD_RE2C=SYSTEM";
+ --disable-libz) options="$options -DBRLCAD_ZLIB=SYSTEM";
shift;;
- --enable-perplex) options="$options
-DBRLCAD_PERPLEX=BUNDLED";
- shift;;
- --disable-perplex) options="$options
-DBRLCAD_PERPLEX=SYSTEM";
- shift;;
- --enable-astyle) options="$options
-DBRLCAD_ASTYLE=BUNDLED";
- shift;;
- --disable-astyle) options="$options
-DBRLCAD_ASTYLE=SYSTEM";
- shift;;
- --enable-xsltproc) options="$options
-DBRLCAD_XSLTPROC=BUNDLED";
- shift;;
- --disable-xsltproc) options="$options
-DBRLCAD_XSLTPROC=SYSTEM";
- shift;;
- --enable-xmllint) options="$options
-DBRLCAD_XMLLINT=BUNDLED";
- shift;;
- --disable-xmllint) options="$options
-DBRLCAD_XMLLINT=SYSTEM";
- shift;;
--enable-regex) options="$options -DBRLCAD_REGEX=BUNDLED";
shift;;
--disable-regex) options="$options -DBRLCAD_REGEX=SYSTEM";
shift;;
- --enable-zlib) options="$options -DBRLCAD_ZLIB=BUNDLED";
+ --enable-netpbm) options="$options
-DBRLCAD_NETPBM=BUNDLED";
shift;;
- --disable-zlib) options="$options -DBRLCAD_ZLIB=SYSTEM";
+ --disable-netpbm) options="$options
-DBRLCAD_NETPBM=SYSTEM";
shift;;
- --enable-libz) options="$options -DBRLCAD_ZLIB=BUNDLED";
- shift;;
- --disable-libz) options="$options -DBRLCAD_ZLIB=SYSTEM";
- shift;;
--enable-png) options="$options -DBRLCAD_PNG=BUNDLED";
shift;;
--disable-png) options="$options -DBRLCAD_PNG=SYSTEM";
shift;;
- --enable-netpbm) options="$options
-DBRLCAD_NETPBM=BUNDLED";
+ --enable-proj4) options="$options -DBRLCAD_PROJ4=BUNDLED";
shift;;
- --disable-netpbm) options="$options
-DBRLCAD_NETPBM=SYSTEM";
+ --disable-proj4) options="$options -DBRLCAD_PROJ4=SYSTEM";
shift;;
- --enable-utahrle) options="$options
-DBRLCAD_UTAHRLE=BUNDLED";
+ --enable-gdal) options="$options -DBRLCAD_GDAL=BUNDLED";
shift;;
- --disable-utahrle) options="$options
-DBRLCAD_UTAHRLE=SYSTEM";
+ --disable-gdal) options="$options -DBRLCAD_GDAL=SYSTEM";
shift;;
--enable-tcl) options="$options -DBRLCAD_TCL=BUNDLED";
shift;;
--disable-tcl) options="$options -DBRLCAD_TCL=SYSTEM";
shift;;
- --enable-tk) options="$options -DBRLCAD_TK=BUNDLED";
+ --enable-astyle) options="$options
-DBRLCAD_ASTYLE=BUNDLED";
shift;;
- --disable-tk) options="$options -DBRLCAD_TK=SYSTEM";
+ --disable-astyle) options="$options
-DBRLCAD_ASTYLE=SYSTEM";
shift;;
- --enable-itcl) options="$options -DBRLCAD_ITCL=BUNDLED";
+ --enable-xsltproc) options="$options
-DBRLCAD_XSLTPROC=BUNDLED";
shift;;
- --disable-itcl) options="$options -DBRLCAD_ITCL=SYSTEM";
+ --disable-xsltproc) options="$options
-DBRLCAD_XSLTPROC=SYSTEM";
shift;;
- --enable-itk) options="$options -DBRLCAD_ITK=BUNDLED";
+ --enable-xmllint) options="$options
-DBRLCAD_XMLLINT=BUNDLED";
shift;;
- --disable-itk) options="$options -DBRLCAD_ITK=SYSTEM";
+ --disable-xmllint) options="$options
-DBRLCAD_XMLLINT=SYSTEM";
shift;;
- --enable-iwidgets) options="$options
-DBRLCAD_IWIDGETS=BUNDLED";
- shift;;
- --disable-iwidgets) options="$options
-DBRLCAD_IWIDGETS=SYSTEM";
- shift;;
- --enable-tkhtml) options="$options
-DBRLCAD_TKHTML=BUNDLED";
- shift;;
- --disable-tkhtml) options="$options
-DBRLCAD_TKHTML=SYSTEM";
- shift;;
- --enable-tktable) options="$options
-DBRLCAD_TKTABLE=BUNDLED";
- shift;;
- --disable-tktable) options="$options
-DBRLCAD_TKTABLE=SYSTEM";
- shift;;
- --enable-opennurbs) options="$options
-DBRLCAD_OPENNURBS=BUNDLED";
- shift;;
- --disable-opennurbs) options="$options
-DBRLCAD_OPENNURBS=SYSTEM";
- shift;;
- --enable-scl) options="$options -DBRLCAD_SC=BUNDLED";
- shift;;
- --disable-scl) options="$options -DBRLCAD_SC=SYSTEM";
- shift;;
- --enable-step) options="$options -DBRLCAD_SC=BUNDLED";
- shift;;
- --disable-step) options="$options -DBRLCAD_SC=SYSTEM";
- shift;;
- --enable-step-class-libraries) options="$options
-DBRLCAD_SC=BUNDLED";
- shift;;
- --disable-step-class-libraries) options="$options
-DBRLCAD_SC=SYSTEM";
- shift;;
- --enable-openscenegraph) options="$options
-DBRLCAD_OSG=BUNDLED";
- shift;;
- --disable-openscenegraph) options="$options
-DBRLCAD_OSG=SYSTEM";
- shift;;
- --enable-proj4) options="$options -DBRLCAD_PROJ4=BUNDLED";
- shift;;
- --disable-proj4) options="$options -DBRLCAD_PROJ4=SYSTEM";
- shift;;
- --enable-gdal) options="$options -DBRLCAD_GDAL=BUNDLED";
- shift;;
- --disable-gdal) options="$options -DBRLCAD_GDAL=SYSTEM";
- shift;;
--prefix=*) inputstr=$1;
options="$options
-DCMAKE_INSTALL_PREFIX=${inputstr#--prefix=}";
shift;;
Modified: brlcad/branches/extbuild/misc/CMake/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/misc/CMake/CMakeLists.txt 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/misc/CMake/CMakeLists.txt 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -64,8 +64,6 @@
RPath_Setup.cmake
ResetCache.cmake
TCL_PKGINDEX.cmake
- ThirdParty.cmake
- ThirdParty_TCL.cmake
compat/README
compat/README.compat
compat/README.compat.c99
@@ -102,8 +100,9 @@
multiconfig_path_read.cmake.in
source_archive_setup.cmake.in
tcltest.tcl.in
+ scripts/printtime.cmake
+ scripts/tcl_mkindex.cmake
scripts/timestamp.cmake
- scripts/printtime.cmake
)
CMAKEFILES(${cmake_ignore_files})
Deleted: brlcad/branches/extbuild/misc/CMake/ThirdParty.cmake
===================================================================
--- brlcad/branches/extbuild/misc/CMake/ThirdParty.cmake 2020-10-23
14:14:03 UTC (rev 77608)
+++ brlcad/branches/extbuild/misc/CMake/ThirdParty.cmake 2020-10-23
14:49:29 UTC (rev 77609)
@@ -1,556 +0,0 @@
-# T H I R D P A R T Y . C M A K E
-# BRL-CAD
-#
-# Copyright (c) 2011-2020 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-
-include(CMakeParseArguments)
-
-# Synopsis:
-#
-# THIRD_PARTY(dir
-# varname_root
-# build_target
-# description
-# [FIND_NAME name]
-# [FIND_VERSION version]
-# [FIND_COMPONENTS component1 component2 ...]
-# [REQUIRED_VARS var1 var2 ...]
-# [RESET_VARS var1 var2 ...]
-# [ALIASES alias1 alias2 ...]
-# [FLAGS flag1 flag2 ...]
-# [UNDOCUMENTED]
-# )
-
-#-----------------------------------------------------------------------------
-function(THIRD_PARTY dir varname_root build_target description)
-
- # Parse extra arguments
- CMAKE_PARSE_ARGUMENTS(TP "UNDOCUMENTED;NOSYS" "FIND_NAME;FIND_VERSION"
"FIND_COMPONENTS;REQUIRED_VARS;RESET_VARS;ALIASES;FLAGS" ${ARGN})
-
- # If the library variable has been explicitly set, get
- # a normalized version of it for easier matching
- set(local_opt)
- if(NOT "${${CMAKE_PROJECT_NAME}_${varname_root}}" STREQUAL "")
- set(local_opt "${${CMAKE_PROJECT_NAME}_${varname_root}}")
- endif(NOT "${${CMAKE_PROJECT_NAME}_${varname_root}}" STREQUAL "")
- VAL_NORMALIZE(local_opt ABS)
-
- # Initialize some variables
- set(TP_DISABLED 0)
- set(TP_DISABLE_TEST 0)
- set(TP_MET_CONDITION 0)
- if(NOT TP_FIND_NAME)
- set(TP_FIND_NAME ${varname_root})
- endif(NOT TP_FIND_NAME)
- foreach(item ${TP_RESET_VARS})
- set(${item} "${varname_root}-NOTFOUND" CACHE STRING "${item}" FORCE)
- endforeach(item ${TP_RESET_VARS})
-
- # 0. Whether or not we're building the sources, we are tracking the files
- # that are supposed to be in the directory
- get_filename_component(DIR_NAME "${dir}" NAME)
- if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
- message(FATAL_ERROR "Third party component ${DIR_NAME} does not have a
dist file at \"${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist\"")
- endif(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
- include("${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
- CMAKEFILES_IN_DIR(${DIR_NAME}_ignore_files ${dir})
-
- # 1. If any of the required flags are off, this extension is a no-go.
- set(DISABLE_STR "")
- foreach(item ${TP_REQUIRED_VARS})
- if(NOT ${item})
- set(TP_DISABLED 1)
- set(TP_DISABLE_TEST 1)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD OFF)
- if(NOT DISABLE_STR)
- set(DISABLE_STR "${item}")
- else(NOT DISABLE_STR)
- set(DISABLE_STR "${DISABLE_STR},${item}")
- endif(NOT DISABLE_STR)
- endif(NOT ${item})
- endforeach(item ${TP_REQUIRED_VARS})
- if(DISABLE_STR)
- set(${CMAKE_PROJECT_NAME}_${varname_root} "DISABLED ${DISABLE_STR}" CACHE
STRING "DISABLED ${DISABLED_STR}" FORCE)
- mark_as_advanced(FORCE ${CMAKE_PROJECT_NAME}_${varname_root})
- set_property(CACHE ${CMAKE_PROJECT_NAME}_${varname_root} PROPERTY STRINGS
"DISABLED ${DISABLE_STR}")
- set(TP_MET_CONDITION 1)
- else(DISABLE_STR)
- # If we have a leftover disabled setting in the cache from earlier runs,
clear it.
- if("${local_opt}" MATCHES "DISABLED")
- set(${CMAKE_PROJECT_NAME}_${varname_root} "" CACHE STRING "Clear
DISABLED setting" FORCE)
- mark_as_advanced(CLEAR ${CMAKE_PROJECT_NAME}_${varname_root})
- endif("${local_opt}" MATCHES "DISABLED")
- endif(DISABLE_STR)
-
- # 2. Next - is the library variable explicitly set to SYSTEM? If it is, we
are NOT building it.
- if(local_opt)
- if("${local_opt}" STREQUAL "SYSTEM")
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD OFF)
- set(${CMAKE_PROJECT_NAME}_${varname_root} "SYSTEM" CACHE STRING "User
forced to SYSTEM" FORCE)
- set(TP_MET_CONDITION 2)
- if(TP_NOSYS)
- message(WARNING "Compilation of ${build_target} was disabled, but
local copy is modified - using a system version of ${build_target} may
introduce problems or even fail to work!")
- endif(TP_NOSYS)
- endif("${local_opt}" STREQUAL "SYSTEM")
- endif(local_opt)
-
- # 3. If we have a NOSYS flag and aren't explicitly disabled, ALWAYS use the
bundled version.
- # The NOSYS flag signifies that the BRL-CAD project requires modifications
in the local src/other
- # version of a library or tool that are not likely to be present in a system
version. These flags
- # should be periodically reviewed to determine if they can be removed (i.e.
system packages have
- # appeared in modern OS distributions with the fixes needed by BRL-CAD...)
- if(NOT TP_MET_CONDITION AND TP_NOSYS)
- set(${CMAKE_PROJECT_NAME}_${varname_root} "BUNDLED" CACHE STRING "NOSYS
passed, using bundled ${build_target}" FORCE)
- mark_as_advanced(${CMAKE_PROJECT_NAME}_${varname_root})
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD ON)
- set(TP_MET_CONDITION 3)
- set(TP_DISABLE_TEST 1)
- endif(NOT TP_MET_CONDITION AND TP_NOSYS)
-
- # 4. If we have an explicit BUNDLE request for this particular library,
honor it as long as
- # features are satisfied. No point in testing if we know we're turning it
on - set vars accordingly.
- if(local_opt)
- if("${local_opt}" STREQUAL "BUNDLED")
- if(NOT TP_MET_CONDITION)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD ON)
- set(${CMAKE_PROJECT_NAME}_${varname_root} "BUNDLED" CACHE STRING "User
forced to BUNDLED" FORCE)
- set(TP_DISABLE_TEST 1)
- set(TP_MET_CONDITION 4)
- endif(NOT TP_MET_CONDITION)
- endif("${local_opt}" STREQUAL "BUNDLED")
- endif(local_opt)
-
- # 5. If BRLCAD_BUNDLED_LIBS is exactly SYSTEM or exactly BUNDLED, and we
haven't been overridden by
- # one of the other conditions above, go with that.
- if(NOT TP_MET_CONDITION)
- if("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}"
STREQUAL "BUNDLED")
- set(${CMAKE_PROJECT_NAME}_${varname_root} "${BRLCAD_BUNDLED_LIBS}
(AUTO)" CACHE STRING "BRLCAD_BUNDLED_LIBS: ${BRLCAD_BUNDLED_LIBS}" FORCE)
- if("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM")
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD OFF)
- set(TP_MET_CONDITION 5)
- elseif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "BUNDLED")
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD ON)
- set(TP_DISABLE_TEST 1)
- set(TP_MET_CONDITION 5)
- endif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM")
- endif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM" OR
"${BRLCAD_BUNDLED_LIBS}" STREQUAL "BUNDLED")
- endif(NOT TP_MET_CONDITION)
-
- # If we haven't been knocked out by any of the above conditions, do our
testing and base the results on that.
-
- if(NOT TP_DISABLE_TEST)
- # Stash the previous results (if any) so we don't repeatedly call out the
tests - only report
- # if something actually changes in subsequent runs.
- set(${varname_root}_FOUND_STATUS ${${varname_root}_FOUND})
-
- # Initialize (or rather, uninitialize) variables in preparation for search
- set(${varname_root}_FOUND "${varname_root}-NOTFOUND")
- mark_as_advanced(${varname_root}_FOUND)
- set(${varname_root}_LIBRARY "${varname_root}-NOTFOUND" CACHE STRING
"${varname_root}_LIBRARY" FORCE)
- mark_as_advanced(${varname_root}_LIBRARY)
- set(${varname_root}_LIBRARIES "${varname_root}-NOTFOUND" CACHE STRING
"${varname_root}_LIBRARIES" FORCE)
- mark_as_advanced(${varname_root}_LIBRARIES)
- set(${varname_root}_INCLUDE_DIR "${varname_root}-NOTFOUND" CACHE STRING
"${varname_root}_INCLUDE_DIR" FORCE)
- mark_as_advanced(${varname_root}_INCLUDE_DIR)
- set(${varname_root}_INCLUDE_DIRS "${varname_root}-NOTFOUND" CACHE STRING
"${varname_root}_INCLUDE_DIRS" FORCE)
- mark_as_advanced(${varname_root}_INCLUDE_DIRS)
-
- # Be quiet if we're doing this over
- if("${${varname_root}_FOUND_STATUS}" MATCHES "NOTFOUND")
- set(${varname_root}_FIND_QUIETLY TRUE)
- endif("${${varname_root}_FOUND_STATUS}" MATCHES "NOTFOUND")
-
- # Find the package in question. It is the toplevel CMakeLists.txt's
responsibility to make
- # sure that the CMAKE_MODULE_PATH variable is set correctly if there are
local versions of
- # Find*.cmake scripts that should be used. Note that newer CMake versions
will prefer a system
- # version of the module, so if a custom override is needed the Find*.cmake
name should not conflict
- # with the system version.
- find_package(${TP_FIND_NAME} ${TP_FIND_VERSION} COMPONENTS
${TP_FIND_COMPONENTS})
-
- # going to use system or bundled versions of deps
- if(${varname_root}_FOUND)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD OFF)
- if(NOT "${CMAKE_PROJECT_NAME}_${varname_root}" STREQUAL "SYSTEM")
- set(${CMAKE_PROJECT_NAME}_${varname_root} "SYSTEM (AUTO)" CACHE STRING
"Found System version, using" FORCE)
- endif(NOT "${CMAKE_PROJECT_NAME}_${varname_root}" STREQUAL "SYSTEM")
- else(${varname_root}_FOUND)
- # If one of our previous conditions precludes building this library,
we've got a problem.
- if("${local_opt}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}" STREQUAL
SYSTEM)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD OFF)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_NOTFOUND 1)
- message(WARNING "Compilation of local version of ${build_target} was
disabled, but system version not found!")
- if(NOT "${local_opt}" STREQUAL "SYSTEM")
- set(${CMAKE_PROJECT_NAME}_${varname_root} "SYSTEM (AUTO)" CACHE
STRING "BRLCAD_BUNDLED_LIBS forced to SYSTEM, but library not found!" FORCE)
- else(NOT "${local_opt}" STREQUAL "SYSTEM")
- set(${CMAKE_PROJECT_NAME}_${varname_root} "SYSTEM" CACHE STRING
"Hard-set to SYSTEM by user, but library not found!" FORCE)
- endif(NOT "${local_opt}" STREQUAL "SYSTEM")
- else("${local_opt}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}"
STREQUAL SYSTEM)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD ON)
- set(${CMAKE_PROJECT_NAME}_${varname_root} "BUNDLED (AUTO)" CACHE STRING
"System test failed, enabling local copy" FORCE)
- endif("${local_opt}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}"
STREQUAL SYSTEM)
- endif(${varname_root}_FOUND)
- endif(NOT TP_DISABLE_TEST)
-
- # If we're going with a system version of a library, we have to remove any
previously built
- # output from enabled bundled copies of the library in question, or the
linker will get
- # confused - a system lib was found and system libraries are to be preferred
with current
- # options. This is unfortunate in that it may introduce extra build work
just from trying
- # configure options, but appears to be essential to ensuring that the build
"just works"
- # each time.
- if(NOT ${CMAKE_PROJECT_NAME}_${varname_root}_BUILD)
- string(REGEX REPLACE "lib" "" rootname "${build_target}")
- file(GLOB STALE_FILES
"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${rootname}*${CMAKE_SHARED_LIBRARY_SUFFIX}*")
-
- foreach(stale_file ${STALE_FILES})
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E remove ${stale_file}
- OUTPUT_VARIABLE rm_out
- RESULT_VARIABLE rm_retval
- )
- endforeach(stale_file ${STALE_FILES})
-
- if(NOT "${CMAKE_PROJECT_NAME}_${varname_root}" MATCHES "${local_opt}")
- if("${local_opt}" MATCHES "BUNDLED")
- message("Reconfiguring to use system ${varname_root}")
- endif("${local_opt}" MATCHES "BUNDLED")
- endif(NOT "${CMAKE_PROJECT_NAME}_${varname_root}" MATCHES "${local_opt}")
- endif(NOT ${CMAKE_PROJECT_NAME}_${varname_root}_BUILD)
-
- # After all that, we know now what to do about src/other/${dir} - do it
- if(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD)
- add_subdirectory(${dir})
- set(${varname_root}_LIBRARY "${build_target}" CACHE STRING
"${varname_root}_LIBRARY" FORCE)
- set(${varname_root}_LIBRARIES "${build_target}" CACHE STRING
"${varname_root}_LIBRARIES" FORCE)
- set(${varname_root}_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${dir}"
"${CMAKE_CURRENT_BINARY_DIR}/${dir}" CACHE STRING "set by THIRD_PARTY_SUBDIR
macro" FORCE)
- set(${varname_root}_INCLUDE_DIRS "${${varname_root}_INCLUDE_DIR}" CACHE
STRING "set by THIRD_PARTY_SUBDIR macro" FORCE)
- endif(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD)
-
- # Let parent scope know what's happening
- set(${varname_root}_FOUND "${${varname_root}_FOUND}" PARENT_SCOPE)
- set(${varname_root}_LIBRARY "${${varname_root}_LIBRARY}" PARENT_SCOPE)
- mark_as_advanced(${varname_root}_LIBRARY)
- set(${varname_root}_LIBRARIES "${${varname_root}_LIBRARIES}" PARENT_SCOPE)
- mark_as_advanced(${varname_root}_LIBRARIES)
- set(${varname_root}_INCLUDE_DIR "${${varname_root}_INCLUDE_DIR}"
PARENT_SCOPE)
- mark_as_advanced(${varname_root}_INCLUDE_DIR)
- set(${varname_root}_INCLUDE_DIRS "${${varname_root}_INCLUDE_DIRS}"
PARENT_SCOPE)
- mark_as_advanced(${varname_root}_INCLUDE_DIRS)
-
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD
${${CMAKE_PROJECT_NAME}_${varname_root}_BUILD} PARENT_SCOPE)
- set(${CMAKE_PROJECT_NAME}_${varname_root}
"${${CMAKE_PROJECT_NAME}_${varname_root}}" PARENT_SCOPE)
-
- if(NOT ${varname_root}_UNDOCUMENTED)
- BRLCAD_OPTION("${CMAKE_PROJECT_NAME}_${varname_root}"
"${${CMAKE_PROJECT_NAME}_${varname_root}}"
- TYPE ABS
- ALIASES ${TP_ALIASES}
- DESCRIPTION "${description}")
- endif(NOT ${varname_root}_UNDOCUMENTED)
-
- # For drop-down menus in CMake gui - set STRINGS property
- set_property(CACHE ${CMAKE_PROJECT_NAME}_${varname_root} PROPERTY STRINGS
AUTO BUNDLED SYSTEM)
-
-endfunction(THIRD_PARTY)
-
-
-#-----------------------------------------------------------------------------
-function(THIRD_PARTY_EXECUTABLE dir varname_root build_target)
-
- # Parse extra arguments
- CMAKE_PARSE_ARGUMENTS(TP "NOSYS" "" "REQUIRED_VARS;ALIASES;DESCRIPTION"
${ARGN})
-
- # If the exec variable has been explicitly set, get
- # an normalized version of it for easier matching
- set(local_opt)
- if(NOT ${${CMAKE_PROJECT_NAME}_${varname_root}} STREQUAL "")
- set(local_opt "${${CMAKE_PROJECT_NAME}_${varname_root}}")
- endif(NOT ${${CMAKE_PROJECT_NAME}_${varname_root}} STREQUAL "")
- VAL_NORMALIZE(local_opt ABS)
-
- # Initialize some variables
- set(TP_DISABLED 0)
- set(TP_DISABLE_TEST 0)
- set(TP_MET_CONDITION 0)
-
- # 0. Whether or not we're building the sources, we are tracking the files
- # that are supposed to be in the directory
- get_filename_component(DIR_NAME "${dir}" NAME)
- if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
- message(FATAL_ERROR "Third party component ${DIR_NAME} does not have a
dist file at \"${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist\"")
- endif(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
- include("${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
- CMAKEFILES_IN_DIR(${DIR_NAME}_ignore_files ${dir})
-
- # 1. For executables, it is a reasonable use case that the developer
manually specifies
- # the location for an executable. It is tricky to distinguish this
situation from
- # a previously cached executable path resulting from a Find*.cmake script.
The way
- # we will proceed is to cache the value of ${varname_root}_EXECUTABLE if it
is defined, and
- # at the end check it against the results of running the THIRD_PARTY logic.
If
- # it matches neither pattern (Bundled or System) it is assumed that the
value passed
- # in is an intentional setting on the part of the developer. This has one
potential
- # drawback in that the *removal* of a system executable between searches
could result
- # in a previously cached system search result being identified as a
user-specified
- # result - to prevent that, the cached path is only used to override other
results
- # if the file it specifies actually exists. One additional wrinkle here -
if the
- # developer has hard-specified BUNDLED for this particular executable, even
a user specified
- # or cached value will be replaced with the local path. A feature based
disablement
- # of the tool also applies to the cached version.
- if(${varname_root}_EXECUTABLE)
- IS_SUBPATH("${CMAKE_BINARY_DIR}" "${${varname_root}_EXECUTABLE}"
SUBBUILD_TEST)
- if("${SUBBUILD_TEST}" STREQUAL "0")
- get_filename_component(FULL_PATH_EXEC ${${varname_root}_EXECUTABLE}
ABSOLUTE)
- if("${FULL_PATH_EXEC}" STREQUAL "${${varname_root}_EXECUTABLE}")
- if(EXISTS ${FULL_PATH_EXEC})
- set(EXEC_CACHED ${${varname_root}_EXECUTABLE})
- else(EXISTS ${FULL_PATH_EXEC})
- # This path not being present may indicate the user specified a path
- # and made a mistake doing so - warn that this might be the case.
- message(WARNING "File path ${${varname_root}_EXECUTABLE} specified
for ${varname_root}_EXECUTABLE does not exist - this path will not override
${build_target} executable search results.")
- endif(EXISTS ${FULL_PATH_EXEC})
- endif("${FULL_PATH_EXEC}" STREQUAL "${${varname_root}_EXECUTABLE}")
- endif("${SUBBUILD_TEST}" STREQUAL "0")
- endif(${varname_root}_EXECUTABLE)
-
- # 2. If any of the required flags are off, this tool is a no-go.
- set(DISABLE_STR "")
- foreach(item ${TP_REQUIRED_VARS})
- if(NOT ${item})
- set(TP_DISABLED 1)
- set(TP_DISABLE_TEST 1)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD OFF)
- if(NOT DISABLE_STR)
- set(DISABLE_STR "${item}")
- else(NOT DISABLE_STR)
- set(DISABLE_STR "${DISABLE_STR},${item}")
- endif(NOT DISABLE_STR)
- endif(NOT ${item})
- endforeach(item ${TP_REQUIRED_VARS})
- if(DISABLE_STR)
- set(${CMAKE_PROJECT_NAME}_${varname_root} "DISABLED ${DISABLE_STR}" CACHE
STRING "DISABLED ${DISABLED_STR}" FORCE)
- mark_as_advanced(FORCE ${CMAKE_PROJECT_NAME}_${varname_root})
- set(${varname_root}_MET_CONDITION 1)
- else(DISABLE_STR)
- # If we have a leftover disabled setting in the cache from earlier runs,
clear it.
- if("${local_opt}" MATCHES "DISABLED")
- set(${CMAKE_PROJECT_NAME}_${varname_root} "" CACHE STRING "Clear
DISABLED setting" FORCE)
- mark_as_advanced(CLEAR ${CMAKE_PROJECT_NAME}_${varname_root})
- endif("${local_opt}" MATCHES "DISABLED")
- endif(DISABLE_STR)
-
- # 3. Next - is the executable variable explicitly set to SYSTEM? If it is,
we are NOT building it.
- if(local_opt)
- if("${local_opt}" STREQUAL "SYSTEM")
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD OFF)
- set(TP_MET_CONDITION 2)
- if(TP_NOSYS)
- message(WARNING "Compilation of ${build_target} was disabled, but
local copy is modified - using a system version of ${build_target} may
introduce problems or even fail to work!")
- endif(TP_NOSYS)
- endif("${local_opt}" STREQUAL "SYSTEM")
- endif(local_opt)
-
- # 4. If we have a NOSYS flag, ALWAYS* use the bundled version. The NOSYS
flag signifies that
- # the BRL-CAD project requires modifications in the local src/other version
of a library or
- # tool that are not likely to be present in a system version. These flags
should be periodically
- # reviewed to determine if they can be removed (i.e. system packages have
appeared in modern
- # OS distributions with the fixes needed by BRL-CAD...).
- #
- # * In the case of executables, we'll allow a cached value from the user to
override the NOSYS
- # flag, since that's a likely scenario for testing, but that shouldn't be
done except for testing
- # purposes with a NOSYS target.
- if(NOT TP_MET_CONDITION AND TP_NOSYS)
- set(${CMAKE_PROJECT_NAME}_${varname_root} "BUNDLED" CACHE STRING "NOSYS
passed, using bundled ${build_target}" FORCE)
- mark_as_advanced(${CMAKE_PROJECT_NAME}_${varname_root})
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD ON)
- set(TP_MET_CONDITION 3)
- set(TP_DISABLE_TEST 1)
- endif(NOT TP_MET_CONDITION AND TP_NOSYS)
-
- # 5. If we have an explicit BUNDLE request for this particular executable,
honor it as long as
- # features are satisfied. No point in testing if we know we're turning it
on - set vars accordingly.
- if(NOT TP_MET_CONDITION AND "${local_opt}" STREQUAL "BUNDLED")
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD ON)
- set(TP_DISABLE_TEST 1)
- set(TP_MET_CONDITION 4)
- endif(NOT TP_MET_CONDITION AND "${local_opt}" STREQUAL "BUNDLED")
-
-
- # 5. If BRLCAD_BUNDLED_LIBS is exactly SYSTEM or exactly BUNDLED, and we
haven't been overridden by
- # one of the other conditions above, go with that.
- if(NOT TP_MET_CONDITION)
- if("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}"
STREQUAL "BUNDLED")
- set(${CMAKE_PROJECT_NAME}_${varname_root} "${BRLCAD_BUNDLED_LIBS}
(AUTO)" CACHE STRING "BRLCAD_BUNDLED_LIBS: ${BRLCAD_BUNDLED_LIBS}" FORCE)
- if("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM")
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD OFF)
- set(TP_MET_CONDITION 5)
- elseif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "BUNDLED")
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD ON)
- set(TP_DISABLE_TEST 1)
- set(TP_MET_CONDITION 5)
- endif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM")
- endif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM" OR
"${BRLCAD_BUNDLED_LIBS}" STREQUAL "BUNDLED")
- endif(NOT TP_MET_CONDITION)
-
- # If we haven't been knocked out by any of the above conditions, do our
testing and base the results on that.
- if(NOT TP_DISABLE_TEST)
- # Stash the previous results (if any) so we don't repeatedly call out the
tests - only report
- # if something actually changes in subsequent runs.
- set(${varname_root}_FOUND_STATUS ${${varname_root}_FOUND})
-
- # Initialize (or rather, uninitialize) variables in preparation for search
- set(${varname_root}_FOUND "${varname_root}-NOTFOUND" CACHE STRING
"${varname_root}_FOUND" FORCE)
- mark_as_advanced(${varname_root}_FOUND)
- set(${varname_root}_EXECUTABLE "${varname_root}-NOTFOUND" CACHE STRING
"${varname_root}_EXECUTABLE" FORCE)
-
- # Be quiet if we're doing this over
- if("${${varname_root}_FOUND_STATUS}" MATCHES "NOTFOUND")
- set(${varname_root}_FIND_QUIETLY TRUE)
- endif("${${varname_root}_FOUND_STATUS}" MATCHES "NOTFOUND")
-
- # Include the Find module for the executable in question
- if(EXISTS ${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${varname_root}.cmake)
- include(${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${varname_root}.cmake)
- else(EXISTS ${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${varname_root}.cmake)
- include(${CMAKE_ROOT}/Modules/Find${varname_root}.cmake)
- endif(EXISTS ${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/Find${varname_root}.cmake)
-
- # going to use system or bundled versions of deps
- if(${varname_root}_FOUND)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD OFF)
- set(${CMAKE_PROJECT_NAME}_${varname_root} "SYSTEM (AUTO)" CACHE STRING
"Found System version, using" FORCE)
- else(${varname_root}_FOUND)
- # If one of our previous conditions precludes building this library,
we've got a problem unless the
- # cached version is suitable - check that before we warn.
- if(NOT "${local_opt}" STREQUAL "SYSTEM" AND NOT "${BRLCAD_BUNDLED_LIBS}"
STREQUAL SYSTEM)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD ON)
- set(${CMAKE_PROJECT_NAME}_${varname_root} "BUNDLED (AUTO)" CACHE STRING
"System test failed, enabling local copy" FORCE)
- endif(NOT "${local_opt}" STREQUAL "SYSTEM" AND NOT
"${BRLCAD_BUNDLED_LIBS}" STREQUAL SYSTEM)
- endif(${varname_root}_FOUND)
-
- endif(NOT TP_DISABLE_TEST)
-
- # Now that we've run the Find routine, see if we had a cached value
different from any of our
- # standard results
- set(TP_USING_CACHED 0)
- if(NOT "${TP_MET_CONDITION}" STREQUAL "1" AND NOT "${TP_MET_CONDITION}"
STREQUAL "4")
- if(EXEC_CACHED)
- # Is it a build target? If so, don't cache it.
- get_filename_component(EXEC_CACHED_ABS_PATH ${EXEC_CACHED} ABSOLUTE)
- IF ("${EXEC_CACHED_ABS_PATH}" STREQUAL "${PATH_ABS}")
- # Is it the bundled path? (don't override if it is, the bundled option
setting takes care of that)
- if(NOT "${EXEC_CACHED}" STREQUAL
"${CMAKE_BINARY_DIR}/${BIN_DIR}/${build_target}")
- # Is it the same as the found results?
- if(NOT "${EXEC_CACHED}" STREQUAL
"${${varname_root}_EXECUTABLE_FOUND_RESULT}")
- set(${varname_root}_EXECUTABLE ${EXEC_CACHED} CACHE STRING
"Apparently a user specified path was supplied, use it" FORCE)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD OFF)
- set(${CMAKE_PROJECT_NAME}_${varname_root} "SYSTEM (AUTO)" CACHE
STRING "Apparently a user specified path was supplied, use it" FORCE)
- set(TP_USING_CACHED 1)
- endif(NOT "${EXEC_CACHED}" STREQUAL
"${${varname_root}_EXECUTABLE_FOUND_RESULT}")
- endif(NOT "${EXEC_CACHED}" STREQUAL
"${CMAKE_BINARY_DIR}/${BIN_DIR}/${build_target}")
- endif("${EXEC_CACHED_ABS_PATH}" STREQUAL "${PATH_ABS}")
- endif(EXEC_CACHED)
- endif(NOT "${TP_MET_CONDITION}" STREQUAL "1" AND NOT "${TP_MET_CONDITION}"
STREQUAL "4")
-
- # If the CACHED value doesn't look good, and we aren't overridden by any of
the other conditions, set based
- # on the test results
- if(NOT TP_USING_CACHED AND NOT TP_DISABLE_TEST)
- if(${varname_root}_FOUND)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD OFF)
- if(NOT "${CMAKE_PROJECT_NAME}_${varname_root}" STREQUAL "SYSTEM")
- set(${CMAKE_PROJECT_NAME}_${varname_root} "SYSTEM (AUTO)" CACHE STRING
"Found System version, using" FORCE)
- endif(NOT "${CMAKE_PROJECT_NAME}_${varname_root}" STREQUAL "SYSTEM")
- else(${varname_root}_FOUND)
- # If one of our previous conditions precludes building this exec, we've
got a problem.
- if("${local_opt}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}" STREQUAL
SYSTEM)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD ON)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_NOTFOUND 1)
- message(WARNING "Compilation of local version of ${build_target} was
disabled, but system version not found!")
- if(NOT "${local_opt}" STREQUAL "SYSTEM")
- set(${CMAKE_PROJECT_NAME}_${varname_root} "SYSTEM (AUTO)" CACHE
STRING "BRLCAD_BUNDLED_LIBS forced to SYSTEM, but library not found!" FORCE)
- else(NOT "${local_opt}" STREQUAL "SYSTEM")
- set(${CMAKE_PROJECT_NAME}_${varname_root} "SYSTEM" CACHE STRING
"Hard-set to SYSTEM by user, but library not found!" FORCE)
- endif(NOT "${local_opt}" STREQUAL "SYSTEM")
- else("${local_opt}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}"
STREQUAL SYSTEM)
- set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD ON)
- set(${CMAKE_PROJECT_NAME}_${varname_root} "BUNDLED (AUTO)" CACHE STRING
"System test failed, enabling local copy" FORCE)
- endif("${local_opt}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}"
STREQUAL SYSTEM)
- endif(${varname_root}_FOUND)
- endif(NOT TP_USING_CACHED AND NOT TP_DISABLE_TEST)
-
-
- if(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD)
- # In the case of executables, it is possible that a directory may define
more than one
- # executable target. If this is the case, we may have already added this
directory -
- # if so, don't do it again.
- if(SRC_OTHER_ADDED_DIRS)
- list(FIND SRC_OTHER_ADDED_DIRS ${dir} ADDED_RESULT)
- if("${ADDED_RESULT}" STREQUAL "-1")
- add_subdirectory(${dir})
- set(SRC_OTHER_ADDED_DIRS ${SRC_OTHER_ADDED_DIRS} ${dir})
- list(REMOVE_DUPLICATES SRC_OTHER_ADDED_DIRS)
- set(SRC_OTHER_ADDED_DIRS ${SRC_OTHER_ADDED_DIRS} CACHE STRING "Enabled
3rd party sub-directories" FORCE)
- mark_as_advanced(SRC_OTHER_ADDED_DIRS)
- endif("${ADDED_RESULT}" STREQUAL "-1")
- else(SRC_OTHER_ADDED_DIRS)
- add_subdirectory(${dir})
- set(SRC_OTHER_ADDED_DIRS ${dir} CACHE STRING "Enabled 3rd party
sub-directories" FORCE)
- mark_as_advanced(SRC_OTHER_ADDED_DIRS)
- endif(SRC_OTHER_ADDED_DIRS)
- if(CMAKE_CONFIGURATION_TYPES)
- set(${varname_root}_EXECUTABLE
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${BIN_DIR}/${build_target}" CACHE
STRING "${varname_root}_EXECUTABLE" FORCE)
- else(CMAKE_CONFIGURATION_TYPES)
- set(${varname_root}_EXECUTABLE
"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${build_target}" CACHE STRING
"${varname_root}_EXECUTABLE" FORCE)
- endif(CMAKE_CONFIGURATION_TYPES)
- set(${varname_root}_EXECUTABLE_TARGET ${build_target} CACHE STRING "Build
target for ${build_target}" FORCE)
- else(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD)
- set(${varname_root}_EXECUTABLE_TARGET "" CACHE STRING "No build target for
${build_target}" FORCE)
- endif(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD)
-
- if (TP_ALIASES AND TP_DESCRIPTION)
- BRLCAD_OPTION("${CMAKE_PROJECT_NAME}_${varname_root}"
"${${CMAKE_PROJECT_NAME}_${varname_root}}"
- TYPE ABS
- ALIASES ${TP_ALIASES}
- DESCRIPTION "${TP_DESCRIPTION}")
- endif (TP_ALIASES AND TP_DESCRIPTION)
-
- mark_as_advanced(${varname_root}_EXECUTABLE)
- mark_as_advanced(${varname_root}_EXECUTABLE_TARGET)
- mark_as_advanced(${varname_root}_FOUND)
-
-endfunction(THIRD_PARTY_EXECUTABLE)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Deleted: brlcad/branches/extbuild/misc/CMake/ThirdParty_TCL.cmake
===================================================================
--- brlcad/branches/extbuild/misc/CMake/ThirdParty_TCL.cmake 2020-10-23
14:14:03 UTC (rev 77608)
+++ brlcad/branches/extbuild/misc/CMake/ThirdParty_TCL.cmake 2020-10-23
14:49:29 UTC (rev 77609)
@@ -1,405 +0,0 @@
-# T H I R D P A R T Y _ T C L . C M A K E
-# BRL-CAD
-#
-# Copyright (c) 2011-2020 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-
-# The question of whether and when to build Tcl/Tk extensions is among
-# the most complex issues in BRL-CAD's build logic. In order of priority,
-# these are the factors considered when evaluating whether to compile
-# a Tcl/Tk extension:
-#
-# 1. Are the variables listed in required_vars enabled? If one or more
-# of them is not, there is never any point in building or searching for
-# packages requiring those variables. Examples of variables used here
-# include BRLCAD_ENABLE_TK and BRLCAD_ENABLE_OPENGL. If the BRLCAD_<PKG>
-# variable is set to SYSTEM, the only impact this will have if triggered
-# is to disable the execution of the system test.
-# 2. Is the extension variable set to SYSTEM explicitly? If so, the
-# extension will not be built under any circumstances. Whether it
-# is tested for depends on condition 1 above. If it is tested for and
-# not detected (e.g. BRL-CAD's Tk features are enabled and Tkhtml
-# is not found) a BRLCAD_<PKG>_NOTFOUND variable will be set, but
-# the extension will not be enabled.
-# 3. Is the extension variable set to BUNDLED explicitly? If so, only
-# a disabled required_vars variable will disable it, and only then if
-# the extension requires that variable.
-# 4. If BRLCAD_TCL has been set explicitly to SYSTEM (not automatically
-# as a consequence of detecting it in an AUTO search) Tcl/Tk
-# extensions will also need to be SYSTEM unless explicitly enabled
-# by their own BRLCAD_<PKG> variable (condition 3 above). If not
-# found, BRLCAD_<PKG>_NOTFOUND will also be set in this instance.
-# 5. If BRLCAD_TCL has been automatically set to SYSTEM as a consequence
-# of BRLCAD_BUNDLED_LIBS being set to SYSTEM, the situation is
-# regarded as identical to condition 4 above. If not found,
-# BRLCAD_<PKG>_NOTFOUND will also be set in this instance.
-# 6. If BRLCAD_TCL_BUILD is ON (either because BRLCAD_TCL is set to
-# BUNDLED explicitly, because it has been set to BUNDLED (Auto) due
-# to BRLCAD_BUNDLED_LIBS being set to BUNDLED, or because the AUTO
-# search failed to find an acceptable Tcl on the system) Tcl/Tk
-# extensions also default to ON, subject to the above conditions.
-# If the extension has been forced to OFF for any reason other than
-# a feature-based disabling and BRLCAD_TCL is hard-set to
-# bundled (or BRLCAD_BUNDLED_LIBS is set to BUNDLED and BRLCAD_TCL
-# is not hard-set to SYSTEM) CMake will FATAL_ERROR - using a system
-# package when we're NOT using a system Tcl/Tk is probably not
-# workable - even if it somehow compiled and ran, the probability
-# of subtle issues would be high.
-# 7. If none of the above conditions preclude the usefulness of doing
-# so, test the available Tcl/Tk to see if it supplies the package
-# in question. If NEEDS_LIBS is populated, the Tcl/Tk "package require"
-# mechanism is not enough and a system version of the package must
-# also have locatable C libraries If a system version is found that
-# satisfies all criteria, compilation of the extension is disabled -
-#
-# Note: For the time being, this routine does not attempt to address
-# the problem of header identification. In principle it should do so,
-# but the current reality is that oftentimes "private" headers will be
-# needed by BRL-CAD when using Tcl/Tk extensions - these headers may
-# not be installed on system versions of packages, or may be in
-# non-standard places if they are. In those situations, if the system
-# version of the Tcl/Tk package in question is compatible with the
-# copy in src/other (usually the case, since BRL-CAD requires a fairly
-# modern Tcl/Tk to work), the build can use the system package with
-# the *local* copy of the package's private headers, even when building
-# with system extensions. This is sub-optimal, and eventually logic
-# should be added to
-
-#-----------------------------------------------------------------------------
-macro(THIRD_PARTY_TCL_PACKAGE pkgname dir wishcmd depends required_vars
NEEDS_LIBS aliases description)
-
- # Get uppercase version of pkg string
- string(TOUPPER ${pkgname} PKGNAME_UPPER)
- # If the pkg variable has been explicitly set, get
- # an uppercase version of it for easier matching
- if(NOT ${${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}} STREQUAL "")
- string(TOUPPER "${${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}}" OPT_STR_UPPER)
- else(NOT ${${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}} STREQUAL "")
- set(OPT_STR_UPPER "")
- endif(NOT ${${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}} STREQUAL "")
- if(NOT ${OPT_STR_UPPER} STREQUAL "")
- if(${OPT_STR_UPPER} STREQUAL "ON")
- set(OPT_STR_UPPER "BUNDLED")
- endif(${OPT_STR_UPPER} STREQUAL "ON")
- if(${OPT_STR_UPPER} STREQUAL "OFF")
- set(OPT_STR_UPPER "SYSTEM")
- endif(${OPT_STR_UPPER} STREQUAL "OFF")
- endif(NOT ${OPT_STR_UPPER} STREQUAL "")
-
-
- # Initialize some variables
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD "?")
- set(${PKGNAME_UPPER}_DISABLED 0)
- set(${PKGNAME_UPPER}_DISABLE_TEST 0)
- set(${PKGNAME_UPPER}_MET_CONDITION 0)
-
- # 0. Whether or not we're building the sources, we are tracking the files
- # that are supposed to be in the directory
- get_filename_component(DIR_NAME "${dir}" NAME)
- if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
- message(FATAL_ERROR "Third party component ${dir} does not have a dist
file at \"${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist\"")
- endif(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
- include("${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
- CMAKEFILES_IN_DIR(${DIR_NAME}_ignore_files ${dir})
-
- # 1. First up - If any of the required flags are off, not only is this
extension
- # build a no-go but so is the test - BRL-CAD doesn't require it.
- set(DISABLE_STR "")
- foreach(item ${required_vars})
- if(NOT ${item})
- set(${PKGNAME_UPPER}_DISABLED 1)
- set(${PKGNAME_UPPER}_DISABLE_TEST 1)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD OFF)
- if(NOT DISABLE_STR)
- set(DISABLE_STR "${item}")
- else(NOT DISABLE_STR)
- set(DISABLE_STR "${DISABLE_STR},${item}")
- endif(NOT DISABLE_STR)
- endif(NOT ${item})
- endforeach(item ${required_vars})
- if(DISABLE_STR)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} "DISABLED ${DISABLE_STR}" CACHE
STRING "DISABLED ${DISABLED_STR}" FORCE)
- mark_as_advanced(FORCE ${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER})
- set(${PKGNAME_UPPER}_MET_CONDITION 1)
- else(DISABLE_STR)
- # If we have a leftover disabled setting in the cache from earlier runs,
clear it.
- if("${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}" MATCHES "DISABLED")
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} "" CACHE STRING "Clear
DISABLED setting" FORCE)
- mark_as_advanced(CLEAR ${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER})
- endif("${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}" MATCHES "DISABLED")
- endif(DISABLE_STR)
-
- # 2. Next - is the pkg explicitly set to system? If it is,
- # we are NOT building it.
- if(OPT_STR_UPPER)
- if("${OPT_STR_UPPER}" STREQUAL "SYSTEM")
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD OFF)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} "SYSTEM" CACHE STRING "User
forced to SYSTEM" FORCE)
- set(${PKGNAME_UPPER}_MET_CONDITION 2)
- endif("${OPT_STR_UPPER}" STREQUAL "SYSTEM")
- endif(OPT_STR_UPPER)
-
-
- # 3. If we have an explicit BUNDLE request for this particular extension,
- # honor it as long as features are satisfied. No point in testing
- # if we know we're turning it on - set vars accordingly.
- if(OPT_STR_UPPER)
- if("${OPT_STR_UPPER}" STREQUAL "BUNDLED")
- if(NOT ${PKGNAME_UPPER}_MET_CONDITION)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD ON)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} "BUNDLED" CACHE STRING "User
forced to BUNDLED" FORCE)
- set(${PKGNAME_UPPER}_DISABLE_TEST 1)
- set(${PKGNAME_UPPER}_MET_CONDITION 3)
- endif(NOT ${PKGNAME_UPPER}_MET_CONDITION)
- endif("${OPT_STR_UPPER}" STREQUAL "BUNDLED")
- endif(OPT_STR_UPPER)
-
-
- # 4. If BRLCAD_TCL is *exactly* SYSTEM and we aren't already enabled,
- # compilation is off. (Testing depends on #1).
- if("${${CMAKE_PROJECT_NAME}_TCL}" STREQUAL "SYSTEM")
- if(NOT ${PKGNAME_UPPER}_MET_CONDITION)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD OFF)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} "SYSTEM (AUTO)" CACHE STRING
"From ${CMAKE_PROJECT_NAME}_TCL - SYSTEM" FORCE)
- set(${PKGNAME_UPPER}_MET_CONDITION 4)
- endif(NOT ${PKGNAME_UPPER}_MET_CONDITION)
- endif("${${CMAKE_PROJECT_NAME}_TCL}" STREQUAL "SYSTEM")
-
-
- # 5. If BRLCAD_TCL matches SYSTEM and BRLCAD_BUNDLED_LIBS is *exactly*
- # SYSTEM, compilation is off. (Testing depends on #1).
- if("${${CMAKE_PROJECT_NAME}_TCL}" MATCHES "SYSTEM" AND
"${${CMAKE_PROJECT_NAME}_BUNDLED_LIBS}" STREQUAL "SYSTEM")
- if(NOT ${PKGNAME_UPPER}_MET_CONDITION)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD OFF)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} "SYSTEM (AUTO)" CACHE STRING
"From ${CMAKE_PROJECT_NAME}_BUNDLED_LIBS - SYSTEM" FORCE)
- set(${PKGNAME_UPPER}_MET_CONDITION 5)
- endif(NOT ${PKGNAME_UPPER}_MET_CONDITION)
- endif("${${CMAKE_PROJECT_NAME}_TCL}" MATCHES "SYSTEM" AND
"${${CMAKE_PROJECT_NAME}_BUNDLED_LIBS}" STREQUAL "SYSTEM")
-
- # 6. If we're building Tcl itself (for whatever reason) and we aren't
- # already off, default to compilation. If we're building, no point
- # in testing - disable.
- if(${CMAKE_PROJECT_NAME}_TCL_BUILD)
- if(NOT ${PKGNAME_UPPER}_MET_CONDITION)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD ON)
- set(${PKGNAME_UPPER}_DISABLE_TEST 1)
- set(${PKGNAME_UPPER}_MET_CONDITION 6)
- endif(NOT ${PKGNAME_UPPER}_MET_CONDITION)
- endif(${CMAKE_PROJECT_NAME}_TCL_BUILD)
- # Check for the bizarre case of bundled Tcl + system package - error out if
that
- # combination has been specified, since there is no expectation that a
package
- # provided for a system installation of Tcl/Tk would work with BRL-CAD's
local
- # copy. If the feature was disabled it doesn't matter, since that's a
- # "disabled" condition instead of a SYSTEM condition. If we don't hit such a
- # case, properly set ${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}
- if(NOT ${PKGNAME_UPPER}_DISABLED)
- if(${CMAKE_PROJECT_NAME}_TCL_BUILD)
- if(NOT ${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD)
- message(FATAL_ERROR "Local Tcl compilation enabled, but compilation of
Tcl/Tk extension ${pkgname} has been disabled - unsupported configuration!")
- else(NOT ${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} "BUNDLED (AUTO)" CACHE
STRING "From ${CMAKE_PROJECT_NAME}_TCL - BUNDLED" FORCE)
- endif(NOT ${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD)
- endif(${CMAKE_PROJECT_NAME}_TCL_BUILD)
- endif(NOT ${PKGNAME_UPPER}_DISABLED)
-
- # 7. If none of the above conditions preclude us from doing so, start
- # testing.
-
- if(NOT ${PKGNAME_UPPER}_DISABLE_TEST)
- # Initialize test tracking variable
- set(${PKGNAME_UPPER}_TEST_FAIL 0)
- set(${PKGNAME_UPPER}_TCL_PASSED 0)
- set(${PKGNAME_UPPER}_LIBS_FAIL 0)
- # Stash the previous results (if any) so we don't repeatedly
- # call out the tests - only report if something actually
- # changes in subsequent runs.
- set(${PKGNAME_UPPER}_FOUND_STATUS ${${PKGNAME_UPPER}_FOUND})
-
- # 1. If we have no wish command, we fail immediately.
- if("${wishcmd}" STREQUAL "" OR "${wishcmd}" MATCHES "NOTFOUND")
- message(WARNING "Test for ${pkgname} failed - no tclsh/wish command
available for testing!")
- set(${PKGNAME_UPPER}_TEST_FAIL 1)
- endif("${wishcmd}" STREQUAL "" OR "${wishcmd}" MATCHES "NOTFOUND")
-
- # 2. We have wish - now things get interesting. Write out
- # a Tcl script to probe for information on the package we're
- # interested in, and collect the results.
- if(NOT ${PKGNAME_UPPER}_TEST_FAIL)
- set(CURRENT_TCL_PACKAGE_NAME ${pkgname})
- set(pkg_test_file "${CMAKE_BINARY_DIR}/CMakeTmp/${pkgname}_version.tcl")
- configure_file("${BRLCAD_SOURCE_DIR}/misc/CMake/tcltest.tcl.in"
${pkg_test_file} @ONLY)
- DISTCLEAN("${pkg_test_file}")
- EXEC_PROGRAM(${wishcmd} ARGS ${pkg_test_file} OUTPUT_VARIABLE EXECOUTPUT)
- file(READ "${CMAKE_BINARY_DIR}/CMakeTmp/${PKGNAME_UPPER}_PKG_VERSION"
pkgversion)
- string(REGEX REPLACE "\n" "" ${PKGNAME_UPPER}_PACKAGE_VERSION
${pkgversion})
- if(${PKGNAME_UPPER}_PACKAGE_VERSION)
- set(${PKGNAME_UPPER}_TCL_PASSED 1)
- else(${PKGNAME_UPPER}_PACKAGE_VERSION)
- set(${PKGNAME_UPPER}_TCL_PASSED 0)
- endif(${PKGNAME_UPPER}_PACKAGE_VERSION)
- endif(NOT ${PKGNAME_UPPER}_TEST_FAIL)
-
- # 3. After 2, we *almost* know what to do. Check if we need to base
- # the decision on C libraries and headers, as well. If we didn't pass
- # the package version test, then the libraries and headers are moot -
- # we can't assume the package is set up correctly, and need to build
- # our own or report find failure, as the case may be.
- #
- # It might be that the variables we need have already been set by
- # another routine (FindTCL.cmake, for example, does some sophisticated
- # work to set the correct library paths for Tk as part of its search)
- # The user might also be setting variables manually to identify locations
- # outside normal search parameters. On the other hand, if we are changing
- # CMake build settings, we don't want to let build-target settings satisfy
- # the requirements.
- #
- # To handle this, each library variable is first checked to see if it's
- # full path expansion matches the default variable setting. If so, accept
- # the setting. If not, the setting is assumed to be a build target from
- # a bundled configuration and cleared. (If the bundled sources are built
- # in the end, they will be restored.)
-
- if(${PKGNAME_UPPER}_TCL_PASSED)
- if(NOT "${NEEDS_LIBS}" STREQUAL "")
- # We have libraries to find - let's get started.
- foreach(libname ${NEEDS_LIBS})
- # get the uppercase version of the lib name
- string(TOUPPER "${libname}" LIBNAME_UPPER)
- # deduce the variable to hold the library results
- if(${LIBNAME_UPPER} STREQUAL ${PKGNAME_UPPER})
- set(LOOKFOR_LIBRARY "${PKGNAME_UPPER}_LIBRARY")
- set(CORENAME ${pkgname})
- else(${LIBNAME_UPPER} STREQUAL ${PKGNAME_UPPER})
- set(LOOKFOR_LIBRARY "${PKGNAME_UPPER}_${LIBNAME_UPPER}_LIBRARY")
- set(CORENAME ${libname})
- endif(${LIBNAME_UPPER} STREQUAL ${PKGNAME_UPPER})
- set(${PKGNAME_UPPER}_REQUIRED_LIBS ${${PKGNAME_UPPER}_REQUIRED_LIBS}
${${LOOKFOR_LIBRARY}})
- # Check if this variable has already been set, and if
- # so put it to the full path test
- if(${LOOKFOR_LIBRARY})
- get_filename_component(PATH_ABS ${${LOOKFOR_LIBRARY}} ABSOLUTE)
- if(NOT "${${LOOKFOR_LIBRARY}}" STREQUAL "${PATH_ABS}")
- set(${LOOKFOR_LIBRARY} "NOTFOUND" CACHE STRING "RESET" FORCE)
- endif(NOT "${${LOOKFOR_LIBRARY}}" STREQUAL "${PATH_ABS}")
- endif(${LOOKFOR_LIBRARY})
- # If we don't already have a library value, go looking
- if(NOT ${LOOKFOR_LIBRARY} OR "${${LOOKFOR_LIBRARY}}" MATCHES
"NOTFOUND")
- find_library(${LOOKFOR_LIBRARY} NAMES ${libname}
${libname}${${PKGNAME_UPPER}_PACKAGE_VERSION} PATH_SUFFIXES
${libname}${${PKGNAME_UPPER}_PACKAGE_VERSION}
${pkgname}${${PKGNAME_UPPER}_PACKAGE_VERSION})
- endif(NOT ${LOOKFOR_LIBRARY} OR "${${LOOKFOR_LIBRARY}}" MATCHES
"NOTFOUND")
- # If we didn't find anything, we've failed to satisfy
- # the package requirements
- if(NOT ${LOOKFOR_LIBRARY})
- set(${PKGNAME_UPPER}_LIBS_FAIL 1)
- endif(NOT ${LOOKFOR_LIBRARY})
- mark_as_advanced(${LOOKFOR_LIBRARY})
- endforeach(libname ${NEEDS_LIBS})
- endif(NOT "${NEEDS_LIBS}" STREQUAL "")
- endif(${PKGNAME_UPPER}_TCL_PASSED)
- endif(NOT ${PKGNAME_UPPER}_DISABLE_TEST)
-
- # After all that, we finally know what to do - do it.
- string(TOLOWER ${pkgname} PKGNAME_LOWER)
-
- # If testing was disabled, we only care what the _BUILD variable says.
- if(${PKGNAME_UPPER}_DISABLE_TEST)
- if(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD)
- add_subdirectory(${dir})
- foreach(dep ${depends})
- string(TOUPPER ${dep} DEP_UPPER)
- if(BRLCAD_BUILD_${DEP_UPPER})
- add_dependencies(${pkgname} ${dep})
- endif(BRLCAD_BUILD_${DEP_UPPER})
- endforeach(dep ${depends})
- endif(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD)
- endif(${PKGNAME_UPPER}_DISABLE_TEST)
-
- # If testing was NOT disabled, but we're forced to system, see if we
- # need to complain about not finding what we need - we can't enable, so
- # complain. This situation is not as dangerous as the potential subtle
- # issues with system pkg + local Tcl, so we won't FATAL_ERROR - just
- # warn and let things proceed.
- if(NOT ${PKGNAME_UPPER}_DISABLE_TEST)
- if(${PKGNAME_UPPER}_MET_CONDITION STREQUAL "4" OR
${PKGNAME_UPPER}_MET_CONDITION STREQUAL "5")
- if(${PKGNAME_UPPER}_TEST_FAIL OR ${PKGNAME_UPPER}_LIBS_FAIL OR NOT
${PKGNAME_UPPER}_TCL_PASSED)
- set(BRLCAD_${PKGNAME_UPPER}_NOTFOUND 1)
- if(NOT "${wishcmd}" STREQUAL "" AND NOT "${wishcmd}" MATCHES "NOTFOUND")
- message(WARNING "Local compilation of Tcl/Tk extension ${pkgname} was
disabled, but system version not found!")
- endif(NOT "${wishcmd}" STREQUAL "" AND NOT "${wishcmd}" MATCHES
"NOTFOUND")
- endif(${PKGNAME_UPPER}_TEST_FAIL OR ${PKGNAME_UPPER}_LIBS_FAIL OR NOT
${PKGNAME_UPPER}_TCL_PASSED)
- endif(${PKGNAME_UPPER}_MET_CONDITION STREQUAL "4" OR
${PKGNAME_UPPER}_MET_CONDITION STREQUAL "5")
- endif(NOT ${PKGNAME_UPPER}_DISABLE_TEST)
-
- # If testing was NOT disable, and none of the MET_CONDITIONs are satisfied,
- # we base our decision on the test results.
- if(NOT ${PKGNAME_UPPER}_MET_CONDITION)
- if(NOT ${PKGNAME_UPPER}_TEST_FAIL)
- if(NOT ${PKGNAME_UPPER}_LIBS_FAIL)
- if(${PKGNAME_UPPER}_TCL_PASSED)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD OFF)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} "SYSTEM (AUTO)" CACHE
STRING "Detection based - SYSTEM" FORCE)
- else(${PKGNAME_UPPER}_TCL_PASSED)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD ON)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} "BUNDLED (AUTO)" CACHE
STRING "Detection based - BUNDLED" FORCE)
- endif(${PKGNAME_UPPER}_TCL_PASSED)
- else(NOT ${PKGNAME_UPPER}_LIBS_FAIL)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD ON)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} "BUNDLED (AUTO)" CACHE
STRING "Detection based - BUNDLED" FORCE)
- endif(NOT ${PKGNAME_UPPER}_LIBS_FAIL)
- else(NOT ${PKGNAME_UPPER}_TEST_FAIL)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD ON)
- set(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} "BUNDLED (AUTO)" CACHE STRING
"Detection based - BUNDLED" FORCE)
- endif(NOT ${PKGNAME_UPPER}_TEST_FAIL)
- if(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD)
- add_subdirectory(${dir})
- foreach(dep ${depends})
- string(TOUPPER ${dep} DEP_UPPER)
- if(BRLCAD_BUILD_${DEP_UPPER})
- add_dependencies(${pkgname} ${dep})
- endif(BRLCAD_BUILD_${DEP_UPPER})
- endforeach(dep ${depends})
- endif(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD)
- endif(NOT ${PKGNAME_UPPER}_MET_CONDITION)
-
- BRLCAD_OPTION("${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}"
"${${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}}"
- TYPE ABS
- ALIASES ${${aliases}}
- DESCRIPTION "${description}")
-
-endmacro(THIRD_PARTY_TCL_PACKAGE)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Modified: brlcad/branches/extbuild/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/CMakeLists.txt 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/CMakeLists.txt 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -106,7 +106,10 @@
set(UTAHRLE_INCLUDE_DIR "${BRLCAD_SOURCE_DIR}/src/other/libutahrle/include"
CACHE STRING "directory with rle.h header" FORCE)
mark_as_advanced(UTAHRLE_INCLUDE_DIR)
endif (BRLCAD_LEVEL3)
+include("${CMAKE_CURRENT_SOURCE_DIR}/libutahrle.dist")
+CMAKEFILES_IN_DIR(libutahrle_ignore_files libutahrle)
+
# OpenNURBS Library
add_subdirectory(openNURBS)
SetTargetFolder(openNURBS "Third Party Libraries")
@@ -122,7 +125,10 @@
set(openNURBS_headers ${openNURBS_headers} openNURBS/${onhfile})
endforeach(onhfile ${openNURBS_headers_orig})
BRLCAD_MANAGE_FILES(openNURBS_headers ${INCLUDE_DIR}/openNURBS)
+include("${CMAKE_CURRENT_SOURCE_DIR}/openNURBS.dist")
+CMAKEFILES_IN_DIR(openNURBS_ignore_files openNURBS)
+
# Poly2Tri CDT library
# Note - this really should be embedded as part of libbg - it is simple, can be
# compiled as part of libbg with a few source adjustments, and there is an API
@@ -184,9 +190,17 @@
endif (BRLCAD_ENABLE_TCL AND BRLCAD_ENABLE_TK)
-CMAKEFILES(README)
-CMAKEFILES(CMakeLists.txt)
+include("${CMAKE_CURRENT_SOURCE_DIR}/tkhtml.dist")
+CMAKEFILES_IN_DIR(tkhtml_ignore_files tkhtml)
+include("${CMAKE_CURRENT_SOURCE_DIR}/tktable.dist")
+CMAKEFILES_IN_DIR(tktable_ignore_files tktable)
+
+CMAKEFILES(
+ README
+ CMakeLists.txt
+ )
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMakeLists.txt 2020-10-23
14:14:03 UTC (rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/CMakeLists.txt 2020-10-23
14:49:29 UTC (rev 77609)
@@ -249,6 +249,7 @@
## libbson - for binary attributes, always use this local version
#include(${CMAKE_CURRENT_SOURCE_DIR}/bson.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/bson.dist)
# PROJ4 - generic coordinate transformation
include(${CMAKE_CURRENT_SOURCE_DIR}/proj4.cmake)
@@ -256,6 +257,9 @@
# GDAL - translator library for raster and vector geospatial data formats
include(${CMAKE_CURRENT_SOURCE_DIR}/gdal.cmake)
+# OpenSceneGraph
+include(${CMAKE_CURRENT_SOURCE_DIR}/openscenegraph.dist)
+
# TCL - scripting language. For Tcl/Tk builds we want
# static lib building on so we get the stub libraries.
set(BSL_CACHE ${BUILD_STATIC_LIBS})
@@ -270,6 +274,61 @@
std_build_rpath()
+if (COMMAND CMAKEFILES)
+ CMAKEFILES(
+ CMakeLists.txt
+ CMake/ExternalProject_Target.cmake
+ CMake/FindBSON.cmake
+ CMake/FindLEMON.cmake
+ CMake/FindNETPBM.cmake
+ CMake/FindOPENNURBS.cmake
+ CMake/FindPERPLEX.cmake
+ CMake/FindPOLY2TRI.cmake
+ CMake/FindPROJ4.cmake
+ CMake/FindRE2C.cmake
+ CMake/FindREGEX.cmake
+ CMake/FindSTEPCODE.cmake
+ CMake/FindTCL.cmake
+ CMake/FindUTAHRLE.cmake
+ CMake/Path_Setup.cmake
+ CMake/RPath_Setup.cmake
+ CMake/ThirdParty.cmake
+ CMake/ThirdPartyExecutable.cmake
+ CMake/buildpath_replace.cxx.in
+ CMake/rpath_replace.cxx.in
+ CMake/tcl_replace.cxx.in
+ bson.cmake
+ bson.dist
+ gdal.cmake
+ gdal.dist
+ itcl.cmake
+ itcl3.dist
+ itk.cmake
+ itk3.dist
+ iwidgets.cmake
+ iwidgets.dist
+ netpbm.cmake
+ netpbm.dist
+ openscenegraph.dist
+ perplex.cmake
+ perplex.dist
+ png.cmake
+ png.dist
+ proj-4.dist
+ proj4.cmake
+ regex.cmake
+ regex.dist
+ stepcode.cmake
+ stepcode.dist
+ tcl.cmake
+ tcl.dist
+ tk.cmake
+ tk.dist
+ zlib.cmake
+ zlib.dist
+ )
+endif (COMMAND CMAKEFILES)
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/bson.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/bson.cmake 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -85,6 +85,8 @@
endif (BRLCAD_BSON_BUILD)
+include("${CMAKE_CURRENT_SOURCE_DIR}/bson.dist")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/bson.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/bson.dist 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/bson.dist 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -84,3 +84,7 @@
src/yajl/yajl_version.c
src/yajl/yajl_version.h
)
+if (COMMAND CMAKEFILES_IN_DIR)
+ CMAKEFILES_IN_DIR(libbson_ignore_files bson)
+endif (COMMAND CMAKEFILES_IN_DIR)
+
Modified: brlcad/branches/extbuild/src/other/ext/gdal.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/gdal.cmake 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -195,6 +195,8 @@
endif (BRLCAD_GDAL_BUILD)
+include("${CMAKE_CURRENT_SOURCE_DIR}/gdal.dist")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/gdal.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/gdal.dist 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/gdal.dist 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -1267,3 +1267,7 @@
progs/gdaltransform.cpp
progs/gdalwarp_bin.cpp
)
+if (COMMAND CMAKEFILES_IN_DIR)
+ CMAKEFILES_IN_DIR(gdal_ignore_files gdal)
+endif (COMMAND CMAKEFILES_IN_DIR)
+
Modified: brlcad/branches/extbuild/src/other/ext/itcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itcl.cmake 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/itcl.cmake 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -140,6 +140,8 @@
endif (BUILD_ITCL)
endif (BRLCAD_ENABLE_TCL)
+include("${CMAKE_CURRENT_SOURCE_DIR}/itcl3.dist")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/itcl3.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itcl3.dist 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/itcl3.dist 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -1,5 +1,5 @@
set(itcl3_ignore_files
-ITCL_PKGINDEX.cmake
+CMake/FindTCL.cmake
license.terms
generic/itclStubLib.c
generic/itclDecls.h
@@ -20,10 +20,12 @@
generic/itcl_migrate.c
generic/itcl_objects.c
library/itcl.tcl
-pkgIndex.tcl.in
win/dllEntryPoint.c
win/toaster.bmp
win/itcl.rc
CMakeLists.txt
-pkg_mkIndex.cmake
)
+if (COMMAND CMAKEFILES_IN_DIR)
+ CMAKEFILES_IN_DIR(itcl3_ignore_files itcl3)
+endif (COMMAND CMAKEFILES_IN_DIR)
+
Modified: brlcad/branches/extbuild/src/other/ext/itk.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itk.cmake 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/itk.cmake 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -135,6 +135,8 @@
endif (BRLCAD_ENABLE_TK)
+include("${CMAKE_CURRENT_SOURCE_DIR}/itk3.dist")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/itk3.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/itk3.dist 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/itk3.dist 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -1,4 +1,6 @@
set(itk3_ignore_files
+CMake/FindITCL.cmake
+CMake/FindTCL.cmake
license.terms
generic/itkDecls.h
generic/itk_cmds.c
@@ -14,12 +16,13 @@
library/itk.tcl
library/Widget.itk
library/tclIndex
-pkgIndex.tcl.in
-ITK_PKGINDEX.cmake
win/dllEntryPoint.c
win/toaster.bmp
win/rc/itk.rc
win/rc/itk.ico
CMakeLists.txt
-pkg_mkIndex.cmake
)
+if (COMMAND CMAKEFILES_IN_DIR)
+ CMAKEFILES_IN_DIR(itk3_ignore_files itk3)
+endif (COMMAND CMAKEFILES_IN_DIR)
+
Modified: brlcad/branches/extbuild/src/other/ext/iwidgets.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/iwidgets.cmake 2020-10-23
14:14:03 UTC (rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/iwidgets.cmake 2020-10-23
14:49:29 UTC (rev 77609)
@@ -138,6 +138,8 @@
endif (BRLCAD_ENABLE_TK)
+include("${CMAKE_CURRENT_SOURCE_DIR}/iwidgets.dist")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/iwidgets.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/iwidgets.dist 2020-10-23
14:14:03 UTC (rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/iwidgets.dist 2020-10-23
14:49:29 UTC (rev 77609)
@@ -70,3 +70,7 @@
iwidgets.tcl.in
license.terms
)
+if (COMMAND CMAKEFILES_IN_DIR)
+ CMAKEFILES_IN_DIR(iwidgets_ignore_files iwidgets)
+endif (COMMAND CMAKEFILES_IN_DIR)
+
Modified: brlcad/branches/extbuild/src/other/ext/netpbm.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/netpbm.cmake 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/netpbm.cmake 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -66,6 +66,8 @@
endif (BRLCAD_NETPBM_BUILD)
+include("${CMAKE_CURRENT_SOURCE_DIR}/netpbm.dist")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/netpbm.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/netpbm.dist 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/netpbm.dist 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -1,4 +1,4 @@
-set(libnetpbm_ignore_files
+set(netpbm_ignore_files
CMakeLists.txt
README
bitio.c
@@ -67,3 +67,7 @@
util/ppmdcfont.c
version.h.in
)
+if (COMMAND CMAKEFILES_IN_DIR)
+ CMAKEFILES_IN_DIR(netpbm_ignore_files netpbm)
+endif (COMMAND CMAKEFILES_IN_DIR)
+
Modified: brlcad/branches/extbuild/src/other/ext/openscenegraph.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/openscenegraph.dist 2020-10-23
14:14:03 UTC (rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/openscenegraph.dist 2020-10-23
14:49:29 UTC (rev 77609)
@@ -884,3 +884,7 @@
src/osgWidget/Window.cpp
src/osgWidget/WindowManager.cpp
)
+if (COMMAND CMAKEFILES_IN_DIR)
+ CMAKEFILES_IN_DIR(openscenegraph_ignore_files openscenegraph)
+endif (COMMAND CMAKEFILES_IN_DIR)
+
Modified: brlcad/branches/extbuild/src/other/ext/perplex.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/perplex.cmake 2020-10-23
14:14:03 UTC (rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/perplex.cmake 2020-10-23
14:49:29 UTC (rev 77609)
@@ -37,6 +37,8 @@
endif (BRLCAD_LEVEL2)
+include("${CMAKE_CURRENT_SOURCE_DIR}/perplex.dist")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Added: brlcad/branches/extbuild/src/other/ext/perplex.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/perplex.dist
(rev 0)
+++ brlcad/branches/extbuild/src/other/ext/perplex.dist 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -0,0 +1,44 @@
+set(perplex_ignore_files
+CMakeLists.txt
+README.lemon
+README.re2c
+lemon.c
+lempar.c
+perplex/mbo_getopt.cpp
+perplex/mbo_getopt.h
+perplex/parser.y
+perplex/perplex.cpp
+perplex/perplex.h
+perplex/perplex_template.c
+perplex/scanner.re
+perplex/token_type.h
+re2c/actions.cc
+re2c/basics.h
+re2c/bootstrap/scanner.cc
+re2c/code.cc
+re2c/code.h
+re2c/code_names.h
+re2c/config.h.in
+re2c/dfa.cc
+re2c/dfa.h
+re2c/globals.h
+re2c/ins.h
+re2c/main.cc
+re2c/mbo_getopt.cc
+re2c/mbo_getopt.h
+re2c/parser.yy
+re2c/re.h
+re2c/re2c_parser.h
+re2c/scanner.h
+re2c/scanner.re
+re2c/stream_lc.h
+re2c/substr.cc
+re2c/substr.h
+re2c/token.h
+re2c/translate.cc
+)
+
+if (COMMAND CMAKEFILES_IN_DIR)
+ CMAKEFILES_IN_DIR(perplex_ignore_files perplex)
+endif (COMMAND CMAKEFILES_IN_DIR)
+
Property changes on: brlcad/branches/extbuild/src/other/ext/perplex.dist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/branches/extbuild/src/other/ext/png.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png.cmake 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/png.cmake 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -95,6 +95,8 @@
endif (BRLCAD_PNG_BUILD)
+include("${CMAKE_CURRENT_SOURCE_DIR}/png.dist")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/png.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/png.dist 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/png.dist 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -1,4 +1,4 @@
-set(libpng_ignore_files
+set(png_ignore_files
CMakeLists.txt
LICENSE
README
@@ -42,3 +42,7 @@
scripts/symbols.def
scripts/vers.c
)
+if (COMMAND CMAKEFILES_IN_DIR)
+ CMAKEFILES_IN_DIR(png_ignore_files png)
+endif (COMMAND CMAKEFILES_IN_DIR)
+
Modified: brlcad/branches/extbuild/src/other/ext/proj-4.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj-4.dist 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/proj-4.dist 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -198,3 +198,7 @@
src/rtodms.c
src/vector1.c
)
+if (COMMAND CMAKEFILES_IN_DIR)
+ CMAKEFILES_IN_DIR(proj-4_ignore_files proj-4)
+endif (COMMAND CMAKEFILES_IN_DIR)
+
Modified: brlcad/branches/extbuild/src/other/ext/proj4.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/proj4.cmake 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -79,6 +79,8 @@
endif (BRLCAD_PROJ4_BUILD)
+include("${CMAKE_CURRENT_SOURCE_DIR}/proj-4.dist")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/regex.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/regex.cmake 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -59,6 +59,8 @@
endif (BRLCAD_REGEX_BUILD)
+include("${CMAKE_CURRENT_SOURCE_DIR}/regex.dist")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/regex.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/regex.dist 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/regex.dist 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -1,4 +1,4 @@
-set(libregex_ignore_files
+set(regex_ignore_files
CMakeLists.txt
COPYRIGHT
cclass.h
@@ -12,3 +12,7 @@
regfree.c
utils.h
)
+if (COMMAND CMAKEFILES_IN_DIR)
+ CMAKEFILES_IN_DIR(regex_ignore_files regex)
+endif (COMMAND CMAKEFILES_IN_DIR)
+
Modified: brlcad/branches/extbuild/src/other/ext/stepcode.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-10-23
14:14:03 UTC (rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-10-23
14:49:29 UTC (rev 77609)
@@ -205,6 +205,8 @@
SetTargetFolder(stepcode "Third Party Libraries")
endif(BRLCAD_SC_BUILD)
+include("${CMAKE_CURRENT_SOURCE_DIR}/stepcode.dist")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/stepcode.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode.dist 2020-10-23
14:14:03 UTC (rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/stepcode.dist 2020-10-23
14:49:29 UTC (rev 77609)
@@ -530,3 +530,7 @@
test/unitary_schemas/single_inheritance.exp
test/unitary_schemas/single_inheritance_multi_level.exp
)
+if (COMMAND CMAKEFILES_IN_DIR)
+ CMAKEFILES_IN_DIR(stepcode_ignore_files stepcode)
+endif (COMMAND CMAKEFILES_IN_DIR)
+
Modified: brlcad/branches/extbuild/src/other/ext/tcl.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/tcl.cmake 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -356,6 +356,8 @@
endif (BRLCAD_TCL_BUILD)
+include("${CMAKE_CURRENT_SOURCE_DIR}/tcl.dist")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/branches/extbuild/src/other/ext/tcl.dist
===================================================================
--- brlcad/branches/extbuild/src/other/ext/tcl.dist 2020-10-23 14:14:03 UTC
(rev 77608)
+++ brlcad/branches/extbuild/src/other/ext/tcl.dist 2020-10-23 14:49:29 UTC
(rev 77609)
@@ -1,16 +1,16 @@
set(tcl_ignore_files
-CMake/CheckPrototypeExists.cmake
-CMake/FindTIMEZONE.cmake
-CMake/Path_Setup.cmake
-CMake/RPath_Setup.cmake
-CMake/ac_std_funcs.cmake
-CMake/tcl.cmake
-CMake/test_sources/alloca_header_test.c
-CMake/test_sources/alloca_test.c
-CMake/test_sources/ctypes_test.c
-CMake/test_sources/sys_wait_test.c
-CMakeLists.txt
+ChangeLog
+ChangeLog.1999
+ChangeLog.2000
+ChangeLog.2001
+ChangeLog.2002
+ChangeLog.2003
+ChangeLog.2004
+ChangeLog.2005
+ChangeLog.2007
+ChangeLog.2008
README.md
+changes
compat/README
compat/dirent.h
compat/dirent2.h
@@ -31,6 +31,489 @@
compat/strtoul.c
compat/unistd.h
compat/waitpid.c
+compat/zlib/CMakeLists.txt
+compat/zlib/ChangeLog
+compat/zlib/FAQ
+compat/zlib/INDEX
+compat/zlib/README
+compat/zlib/adler32.c
+compat/zlib/amiga/Makefile.pup
+compat/zlib/amiga/Makefile.sas
+compat/zlib/compress.c
+compat/zlib/configure
+compat/zlib/contrib/README.contrib
+compat/zlib/contrib/ada/buffer_demo.adb
+compat/zlib/contrib/ada/mtest.adb
+compat/zlib/contrib/ada/read.adb
+compat/zlib/contrib/ada/readme.txt
+compat/zlib/contrib/ada/test.adb
+compat/zlib/contrib/ada/zlib-streams.adb
+compat/zlib/contrib/ada/zlib-streams.ads
+compat/zlib/contrib/ada/zlib-thin.adb
+compat/zlib/contrib/ada/zlib-thin.ads
+compat/zlib/contrib/ada/zlib.adb
+compat/zlib/contrib/ada/zlib.ads
+compat/zlib/contrib/ada/zlib.gpr
+compat/zlib/contrib/amd64/amd64-match.S
+compat/zlib/contrib/asm686/README.686
+compat/zlib/contrib/asm686/match.S
+compat/zlib/contrib/blast/README
+compat/zlib/contrib/blast/blast.c
+compat/zlib/contrib/blast/blast.h
+compat/zlib/contrib/blast/test.pk
+compat/zlib/contrib/blast/test.txt
+compat/zlib/contrib/delphi/ZLib.pas
+compat/zlib/contrib/delphi/ZLibConst.pas
+compat/zlib/contrib/delphi/readme.txt
+compat/zlib/contrib/delphi/zlibd32.mak
+compat/zlib/contrib/dotzlib/DotZLib.build
+compat/zlib/contrib/dotzlib/DotZLib.chm
+compat/zlib/contrib/dotzlib/DotZLib.sln
+compat/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs
+compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
+compat/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
+compat/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
+compat/zlib/contrib/dotzlib/DotZLib/Deflater.cs
+compat/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
+compat/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj
+compat/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
+compat/zlib/contrib/dotzlib/DotZLib/Inflater.cs
+compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
+compat/zlib/contrib/dotzlib/LICENSE_1_0.txt
+compat/zlib/contrib/dotzlib/readme.txt
+compat/zlib/contrib/gcc_gvmat64/gvmat64.S
+compat/zlib/contrib/infback9/README
+compat/zlib/contrib/infback9/infback9.c
+compat/zlib/contrib/infback9/infback9.h
+compat/zlib/contrib/infback9/inffix9.h
+compat/zlib/contrib/infback9/inflate9.h
+compat/zlib/contrib/infback9/inftree9.c
+compat/zlib/contrib/infback9/inftree9.h
+compat/zlib/contrib/inflate86/inffas86.c
+compat/zlib/contrib/inflate86/inffast.S
+compat/zlib/contrib/iostream/test.cpp
+compat/zlib/contrib/iostream/zfstream.cpp
+compat/zlib/contrib/iostream/zfstream.h
+compat/zlib/contrib/iostream2/zstream.h
+compat/zlib/contrib/iostream2/zstream_test.cpp
+compat/zlib/contrib/iostream3/README
+compat/zlib/contrib/iostream3/TODO
+compat/zlib/contrib/iostream3/test.cc
+compat/zlib/contrib/iostream3/zfstream.cc
+compat/zlib/contrib/iostream3/zfstream.h
+compat/zlib/contrib/masmx64/bld_ml64.bat
+compat/zlib/contrib/masmx64/gvmat64.asm
+compat/zlib/contrib/masmx64/inffas8664.c
+compat/zlib/contrib/masmx64/inffasx64.asm
+compat/zlib/contrib/masmx64/readme.txt
+compat/zlib/contrib/masmx86/bld_ml32.bat
+compat/zlib/contrib/masmx86/inffas32.asm
+compat/zlib/contrib/masmx86/match686.asm
+compat/zlib/contrib/masmx86/readme.txt
+compat/zlib/contrib/minizip/Makefile.am
+compat/zlib/contrib/minizip/MiniZip64_Changes.txt
+compat/zlib/contrib/minizip/MiniZip64_info.txt
+compat/zlib/contrib/minizip/configure.ac
+compat/zlib/contrib/minizip/crypt.h
+compat/zlib/contrib/minizip/ioapi.c
+compat/zlib/contrib/minizip/ioapi.h
+compat/zlib/contrib/minizip/iowin32.c
+compat/zlib/contrib/minizip/iowin32.h
+compat/zlib/contrib/minizip/make_vms.com
+compat/zlib/contrib/minizip/miniunz.c
+compat/zlib/contrib/minizip/miniunzip.1
+compat/zlib/contrib/minizip/minizip.1
+compat/zlib/contrib/minizip/minizip.c
+compat/zlib/contrib/minizip/minizip.pc.in
+compat/zlib/contrib/minizip/mztools.c
+compat/zlib/contrib/minizip/mztools.h
+compat/zlib/contrib/minizip/unzip.c
+compat/zlib/contrib/minizip/unzip.h
+compat/zlib/contrib/minizip/zip.c
+compat/zlib/contrib/minizip/zip.h
+compat/zlib/contrib/pascal/example.pas
+compat/zlib/contrib/pascal/readme.txt
+compat/zlib/contrib/pascal/zlibd32.mak
+compat/zlib/contrib/pascal/zlibpas.pas
+compat/zlib/contrib/puff/README
+compat/zlib/contrib/puff/puff.c
+compat/zlib/contrib/puff/puff.h
+compat/zlib/contrib/puff/pufftest.c
+compat/zlib/contrib/puff/zeros.raw
+compat/zlib/contrib/testzlib/testzlib.c
+compat/zlib/contrib/testzlib/testzlib.txt
+compat/zlib/contrib/untgz/Makefile.msc
+compat/zlib/contrib/untgz/untgz.c
+compat/zlib/contrib/vstudio/readme.txt
+compat/zlib/contrib/vstudio/vc10/miniunz.vcxproj
+compat/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters
+compat/zlib/contrib/vstudio/vc10/minizip.vcxproj
+compat/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters
+compat/zlib/contrib/vstudio/vc10/testzlib.vcxproj
+compat/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters
+compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj
+compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
+compat/zlib/contrib/vstudio/vc10/zlib.rc
+compat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj
+compat/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters
+compat/zlib/contrib/vstudio/vc10/zlibvc.def
+compat/zlib/contrib/vstudio/vc10/zlibvc.sln
+compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj
+compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters
+compat/zlib/contrib/vstudio/vc11/miniunz.vcxproj
+compat/zlib/contrib/vstudio/vc11/minizip.vcxproj
+compat/zlib/contrib/vstudio/vc11/testzlib.vcxproj
+compat/zlib/contrib/vstudio/vc11/testzlibdll.vcxproj
+compat/zlib/contrib/vstudio/vc11/zlib.rc
+compat/zlib/contrib/vstudio/vc11/zlibstat.vcxproj
+compat/zlib/contrib/vstudio/vc11/zlibvc.def
+compat/zlib/contrib/vstudio/vc11/zlibvc.sln
+compat/zlib/contrib/vstudio/vc11/zlibvc.vcxproj
+compat/zlib/contrib/vstudio/vc12/miniunz.vcxproj
+compat/zlib/contrib/vstudio/vc12/minizip.vcxproj
+compat/zlib/contrib/vstudio/vc12/testzlib.vcxproj
+compat/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj
+compat/zlib/contrib/vstudio/vc12/zlib.rc
+compat/zlib/contrib/vstudio/vc12/zlibstat.vcxproj
+compat/zlib/contrib/vstudio/vc12/zlibvc.def
+compat/zlib/contrib/vstudio/vc12/zlibvc.sln
+compat/zlib/contrib/vstudio/vc12/zlibvc.vcxproj
+compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj
+compat/zlib/contrib/vstudio/vc14/minizip.vcxproj
+compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj
+compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj
+compat/zlib/contrib/vstudio/vc14/zlib.rc
+compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj
+compat/zlib/contrib/vstudio/vc14/zlibvc.def
+compat/zlib/contrib/vstudio/vc14/zlibvc.sln
+compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
+compat/zlib/contrib/vstudio/vc9/miniunz.vcproj
+compat/zlib/contrib/vstudio/vc9/minizip.vcproj
+compat/zlib/contrib/vstudio/vc9/testzlib.vcproj
+compat/zlib/contrib/vstudio/vc9/testzlibdll.vcproj
+compat/zlib/contrib/vstudio/vc9/zlib.rc
+compat/zlib/contrib/vstudio/vc9/zlibstat.vcproj
+compat/zlib/contrib/vstudio/vc9/zlibvc.def
+compat/zlib/contrib/vstudio/vc9/zlibvc.sln
+compat/zlib/contrib/vstudio/vc9/zlibvc.vcproj
+compat/zlib/crc32.c
+compat/zlib/crc32.h
+compat/zlib/deflate.c
+compat/zlib/deflate.h
+compat/zlib/examples/README.examples
+compat/zlib/examples/enough.c
+compat/zlib/examples/fitblk.c
+compat/zlib/examples/gun.c
+compat/zlib/examples/gzappend.c
+compat/zlib/examples/gzjoin.c
+compat/zlib/examples/gzlog.c
+compat/zlib/examples/gzlog.h
+compat/zlib/examples/zlib_how.html
+compat/zlib/examples/zpipe.c
+compat/zlib/examples/zran.c
+compat/zlib/gzclose.c
+compat/zlib/gzguts.h
+compat/zlib/gzlib.c
+compat/zlib/gzread.c
+compat/zlib/gzwrite.c
+compat/zlib/infback.c
+compat/zlib/inffast.c
+compat/zlib/inffast.h
+compat/zlib/inffixed.h
+compat/zlib/inflate.c
+compat/zlib/inflate.h
+compat/zlib/inftrees.c
+compat/zlib/inftrees.h
+compat/zlib/make_vms.com
+compat/zlib/msdos/Makefile.bor
+compat/zlib/msdos/Makefile.dj2
+compat/zlib/msdos/Makefile.emx
+compat/zlib/msdos/Makefile.msc
+compat/zlib/msdos/Makefile.tc
+compat/zlib/nintendods/README
+compat/zlib/old/Makefile.emx
+compat/zlib/old/Makefile.riscos
+compat/zlib/old/README
+compat/zlib/old/descrip.mms
+compat/zlib/old/os2/Makefile.os2
+compat/zlib/old/os2/zlib.def
+compat/zlib/old/visual-basic.txt
+compat/zlib/os400/README400
+compat/zlib/os400/bndsrc
+compat/zlib/os400/make.sh
+compat/zlib/os400/zlib.inc
+compat/zlib/qnx/package.qpg
+compat/zlib/test/example.c
+compat/zlib/test/infcover.c
+compat/zlib/test/minigzip.c
+compat/zlib/treebuild.xml
+compat/zlib/trees.c
+compat/zlib/trees.h
+compat/zlib/uncompr.c
+compat/zlib/watcom/watcom_f.mak
+compat/zlib/watcom/watcom_l.mak
+compat/zlib/win32/DLL_FAQ.txt
+compat/zlib/win32/Makefile.bor
+compat/zlib/win32/Makefile.gcc
+compat/zlib/win32/Makefile.msc
+compat/zlib/win32/README-WIN32.txt
+compat/zlib/win32/README.txt
+compat/zlib/win32/USAGE.txt
+compat/zlib/win32/VisualC.txt
+compat/zlib/win32/zdll.lib
+compat/zlib/win32/zlib.def
+compat/zlib/win32/zlib1.dll
+compat/zlib/win32/zlib1.rc
+compat/zlib/win64/libz.dll.a
+compat/zlib/win64/zdll.lib
+compat/zlib/win64/zlib1.dll
+compat/zlib/zconf.h
+compat/zlib/zconf.h.cmakein
+compat/zlib/zconf.h.in
+compat/zlib/zlib.3
+compat/zlib/zlib.3.pdf
+compat/zlib/zlib.h
+compat/zlib/zlib.map
+compat/zlib/zlib.pc.cmakein
+compat/zlib/zlib.pc.in
+compat/zlib/zlib2ansi
+compat/zlib/zutil.c
+compat/zlib/zutil.h
+doc/Access.3
+doc/AddErrInfo.3
+doc/Alloc.3
+doc/AllowExc.3
+doc/AppInit.3
+doc/AssocData.3
+doc/Async.3
+doc/BackgdErr.3
+doc/Backslash.3
+doc/BoolObj.3
+doc/ByteArrObj.3
+doc/CallDel.3
+doc/Cancel.3
+doc/ChnlStack.3
+doc/Class.3
+doc/CmdCmplt.3
+doc/Concat.3
+doc/CrtChannel.3
+doc/CrtChnlHdlr.3
+doc/CrtCloseHdlr.3
+doc/CrtCommand.3
+doc/CrtFileHdlr.3
+doc/CrtInterp.3
+doc/CrtMathFnc.3
+doc/CrtObjCmd.3
+doc/CrtSlave.3
+doc/CrtTimerHdlr.3
+doc/CrtTrace.3
+doc/DString.3
+doc/DetachPids.3
+doc/DictObj.3
+doc/DoOneEvent.3
+doc/DoWhenIdle.3
+doc/DoubleObj.3
+doc/DumpActiveMemory.3
+doc/Encoding.3
+doc/Ensemble.3
+doc/Environment.3
+doc/Eval.3
+doc/Exit.3
+doc/ExprLong.3
+doc/ExprLongObj.3
+doc/FileSystem.3
+doc/FindExec.3
+doc/GetCwd.3
+doc/GetHostName.3
+doc/GetIndex.3
+doc/GetInt.3
+doc/GetOpnFl.3
+doc/GetStdChan.3
+doc/GetTime.3
+doc/GetVersion.3
+doc/Hash.3
+doc/Init.3
+doc/InitStubs.3
+doc/IntObj.3
+doc/Interp.3
+doc/Limit.3
+doc/LinkVar.3
+doc/ListObj.3
+doc/Load.3
+doc/Method.3
+doc/NRE.3
+doc/Namespace.3
+doc/Notifier.3
+doc/OOInitStubs.3
+doc/Object.3
+doc/ObjectType.3
+doc/OpenFileChnl.3
+doc/OpenTcp.3
+doc/Panic.3
+doc/ParseArgs.3
+doc/ParseCmd.3
+doc/PkgRequire.3
+doc/Preserve.3
+doc/PrintDbl.3
+doc/RecEvalObj.3
+doc/RecordEval.3
+doc/RegConfig.3
+doc/RegExp.3
+doc/SaveResult.3
+doc/SetChanErr.3
+doc/SetErrno.3
+doc/SetRecLmt.3
+doc/SetResult.3
+doc/SetVar.3
+doc/Signal.3
+doc/Sleep.3
+doc/SourceRCFile.3
+doc/SplitList.3
+doc/SplitPath.3
+doc/StaticPkg.3
+doc/StdChannels.3
+doc/StrMatch.3
+doc/StringObj.3
+doc/SubstObj.3
+doc/TCL_MEM_DEBUG.3
+doc/Tcl.n
+doc/TclZlib.3
+doc/Tcl_Main.3
+doc/Thread.3
+doc/ToUpper.3
+doc/TraceCmd.3
+doc/TraceVar.3
+doc/Translate.3
+doc/UniCharIsAlpha.3
+doc/UpVar.3
+doc/Utf.3
+doc/WrongNumArgs.3
+doc/after.n
+doc/append.n
+doc/apply.n
+doc/array.n
+doc/bgerror.n
+doc/binary.n
+doc/break.n
+doc/case.n
+doc/catch.n
+doc/cd.n
+doc/chan.n
+doc/class.n
+doc/clock.n
+doc/close.n
+doc/concat.n
+doc/continue.n
+doc/copy.n
+doc/coroutine.n
+doc/dde.n
+doc/define.n
+doc/dict.n
+doc/encoding.n
+doc/eof.n
+doc/error.n
+doc/eval.n
+doc/exec.n
+doc/exit.n
+doc/expr.n
+doc/fblocked.n
+doc/fconfigure.n
+doc/fcopy.n
+doc/file.n
+doc/fileevent.n
+doc/filename.n
+doc/flush.n
+doc/for.n
+doc/foreach.n
+doc/format.n
+doc/gets.n
+doc/glob.n
+doc/global.n
+doc/history.n
+doc/http.n
+doc/if.n
+doc/incr.n
+doc/info.n
+doc/interp.n
+doc/join.n
+doc/lappend.n
+doc/lassign.n
+doc/library.n
+doc/license.terms
+doc/lindex.n
+doc/linsert.n
+doc/list.n
+doc/llength.n
+doc/lmap.n
+doc/load.n
+doc/lrange.n
+doc/lrepeat.n
+doc/lreplace.n
+doc/lreverse.n
+doc/lsearch.n
+doc/lset.n
+doc/lsort.n
+doc/man.macros
+doc/mathfunc.n
+doc/mathop.n
+doc/memory.n
+doc/msgcat.n
+doc/my.n
+doc/namespace.n
+doc/next.n
+doc/object.n
+doc/open.n
+doc/package.n
+doc/packagens.n
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
