Revision: 77321
http://sourceforge.net/p/brlcad/code/77321
Author: starseeker
Date: 2020-10-02 13:26:00 +0000 (Fri, 02 Oct 2020)
Log Message:
-----------
Merge from trunk - r77303 through r77320
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/CMakeLists.txt
brlcad/branches/thirdparty_rework/INSTALL
brlcad/branches/thirdparty_rework/bench/pixcmp.c
brlcad/branches/thirdparty_rework/configure
brlcad/branches/thirdparty_rework/doc/README.Windows
brlcad/branches/thirdparty_rework/doc/legal/embedded/CMakeLists.txt
brlcad/branches/thirdparty_rework/doc/legal/embedded/SPSR.txt
brlcad/branches/thirdparty_rework/doc/legal/other/CMakeLists.txt
brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_Targets.cmake
brlcad/branches/thirdparty_rework/misc/CMake/CMakeLists.txt
brlcad/branches/thirdparty_rework/misc/CMakeLists.txt
brlcad/branches/thirdparty_rework/misc/win32-msvc/Dll/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/external/Creo/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/external/Cubit/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/external/Unigraphics/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/libbg/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/libbg/spsr.c
brlcad/branches/thirdparty_rework/src/librt/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/thirdparty_rework/doc/legal/embedded/gdiam.txt
brlcad/branches/thirdparty_rework/doc/legal/embedded/vds.txt
brlcad/branches/thirdparty_rework/src/libbg/spsr/
brlcad/branches/thirdparty_rework/src/librt/gdiam/
brlcad/branches/thirdparty_rework/src/librt/vds/
Removed Paths:
-------------
brlcad/branches/thirdparty_rework/doc/legal/other/libgdiam.txt
brlcad/branches/thirdparty_rework/doc/legal/other/libvds.txt
brlcad/branches/thirdparty_rework/misc/CMake/FindGDIAM.cmake
brlcad/branches/thirdparty_rework/misc/CMake/FindSPSR.cmake
brlcad/branches/thirdparty_rework/misc/CMake/FindVDS.cmake
brlcad/branches/thirdparty_rework/misc/external_build_testing/
brlcad/branches/thirdparty_rework/src/other/libgdiam/
brlcad/branches/thirdparty_rework/src/other/libgdiam.dist
brlcad/branches/thirdparty_rework/src/other/libspsr/
brlcad/branches/thirdparty_rework/src/other/libspsr.dist
brlcad/branches/thirdparty_rework/src/other/libvds/
brlcad/branches/thirdparty_rework/src/other/libvds.dist
brlcad/branches/thirdparty_rework/src/superbuild/gdiam.cmake
brlcad/branches/thirdparty_rework/src/superbuild/spsr.cmake
brlcad/branches/thirdparty_rework/src/superbuild/vds.cmake
Property Changed:
----------------
brlcad/branches/thirdparty_rework/
brlcad/branches/thirdparty_rework/bench/
brlcad/branches/thirdparty_rework/doc/
brlcad/branches/thirdparty_rework/src/other/
Index: brlcad/branches/thirdparty_rework
===================================================================
--- brlcad/branches/thirdparty_rework 2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework 2020-10-02 13:26:00 UTC (rev 77321)
Property changes on: brlcad/branches/thirdparty_rework
___________________________________________________________________
Modified: svn:mergeinfo
## -11,4 +11,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:75098-75115,75241-77302
\ No newline at end of property
+/brlcad/trunk:75098-75115,75241-77320
\ No newline at end of property
Modified: brlcad/branches/thirdparty_rework/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/CMakeLists.txt 2020-10-02 12:43:17 UTC
(rev 77320)
+++ brlcad/branches/thirdparty_rework/CMakeLists.txt 2020-10-02 13:26:00 UTC
(rev 77321)
@@ -2074,6 +2074,11 @@
endif(${BRLCAD_ENABLE_TARGETS} GREATER 2)
endif(NOT BRLCAD_ENABLE_TARGETS)
+# If we're below level 2, we don't need Tcl
+if (NOT BRLCAD_LEVEL2)
+ set(BRLCAD_ENABLE_TCL OFF CACHE BOOL "Disabled due to level 1 build" FORCE)
+endif (NOT BRLCAD_LEVEL2)
+
# Before we head into src/other and misc/tools, store all the build
# flags that have been built up. It's hard to be sure what will and
# won't be set in those directories, so make sure we can restore the
Modified: brlcad/branches/thirdparty_rework/INSTALL
===================================================================
--- brlcad/branches/thirdparty_rework/INSTALL 2020-10-02 12:43:17 UTC (rev
77320)
+++ brlcad/branches/thirdparty_rework/INSTALL 2020-10-02 13:26:00 UTC (rev
77321)
@@ -571,16 +571,6 @@
Aliases: ENABLE_OPENNURBS
---- BRLCAD_SPSR ---
-
-Option for enabling and disabling compilation of the Screened Poisson
-Surface Reconstruction 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_SPSR
-
-
--- BRLCAD_BSON ---
Option for enabling and disabling compilation of the Libbson library
@@ -590,28 +580,6 @@
Aliases: ENABLE_BSON
---- BRLCAD_VDS ---
-
-Option for enabling and disabling compilation of the libvds triangle
-simplification 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_VDS
-
-
---- BRLCAD_GDIAM ---
-
-Option for enabling and disabling compilation of the libgdiam approximate
-tight bounding box 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_GDIAM
-
-
--- BRLCAD_POLY2TRI ---
Option for enabling and disabling compilation of the poly2tri 2D constrained
Index: brlcad/branches/thirdparty_rework/bench
===================================================================
--- brlcad/branches/thirdparty_rework/bench 2020-10-02 12:43:17 UTC (rev
77320)
+++ brlcad/branches/thirdparty_rework/bench 2020-10-02 13:26:00 UTC (rev
77321)
Property changes on: brlcad/branches/thirdparty_rework/bench
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/osg/bench:62110-62113
/brlcad/branches/prep-cache/bench:68236-68933
/brlcad/branches/tcltk86/bench:68300-75257
-/brlcad/trunk/bench:75241-77302
\ No newline at end of property
+/brlcad/trunk/bench:75241-77320
\ No newline at end of property
Modified: brlcad/branches/thirdparty_rework/bench/pixcmp.c
===================================================================
--- brlcad/branches/thirdparty_rework/bench/pixcmp.c 2020-10-02 12:43:17 UTC
(rev 77320)
+++ brlcad/branches/thirdparty_rework/bench/pixcmp.c 2020-10-02 13:26:00 UTC
(rev 77321)
@@ -215,15 +215,15 @@
if ((sf1.st_size - f1_skip) != (sf2.st_size - f2_skip)) {
bu_log("WARNING: Different image sizes detected\n");
if (print_bytes) {
- bu_log("\t%s: %7zu bytes (%8zu bytes, skipping %7zu)\n",
- argv[0], sf1.st_size - f1_skip, sf1.st_size, f1_skip);
- bu_log("\t%s: %7zu bytes (%8zu bytes, skipping %7zu)\n",
- argv[1], sf2.st_size - f2_skip, sf2.st_size, f2_skip);
+ bu_log("\t%s: %7llu bytes (%8llu bytes, skipping %7llu)\n",
+ argv[0], (unsigned long long)(sf1.st_size - f1_skip),
(unsigned long long)sf1.st_size, (unsigned long long)f1_skip);
+ bu_log("\t%s: %7llu bytes (%8llu bytes, skipping %7llu)\n",
+ argv[1], (unsigned long long)(sf2.st_size - f2_skip),
(unsigned long long)sf2.st_size, (unsigned long long)f2_skip);
} else {
- bu_log("\t%s: %7zu pixels (%8zu bytes, skipping %7zu)\n",
- argv[0], (sf1.st_size - f1_skip)/3, sf1.st_size, f1_skip);
- bu_log("\t%s: %7zu pixels (%8zu bytes, skipping %7zu)\n",
- argv[1], (sf2.st_size - f2_skip)/3, sf2.st_size, f2_skip);
+ bu_log("\t%s: %7llu pixels (%8llu bytes, skipping %7llu)\n",
+ argv[0], (unsigned long long)((sf1.st_size - f1_skip)/3),
(unsigned long long)sf1.st_size, (unsigned long long)f1_skip);
+ bu_log("\t%s: %7llu pixels (%8llu bytes, skipping %7llu)\n",
+ argv[1], (unsigned long long)((sf2.st_size - f2_skip)/3),
(unsigned long long)sf2.st_size, (unsigned long long)f2_skip);
}
bu_exit(1, "ERROR: Cannot pixcmp due to different images sizes
(unimplemented).\n");
}
Modified: brlcad/branches/thirdparty_rework/configure
===================================================================
--- brlcad/branches/thirdparty_rework/configure 2020-10-02 12:43:17 UTC (rev
77320)
+++ brlcad/branches/thirdparty_rework/configure 2020-10-02 13:26:00 UTC (rev
77321)
@@ -134,10 +134,6 @@
shift;;
--disable-opennurbs) options="$options
-DBRLCAD_OPENNURBS=SYSTEM";
shift;;
- --enable-spsr) options="$options -DBRLCAD_SPSR=BUNDLED";
- shift;;
- --disable-spsr) options="$options -DBRLCAD_SPSR=SYSTEM";
- shift;;
--enable-bson) options="$options -DBRLCAD_BSON=BUNDLED";
shift;;
--disable-bson) options="$options -DBRLCAD_BSON=SYSTEM";
Index: brlcad/branches/thirdparty_rework/doc
===================================================================
--- brlcad/branches/thirdparty_rework/doc 2020-10-02 12:43:17 UTC (rev
77320)
+++ brlcad/branches/thirdparty_rework/doc 2020-10-02 13:26:00 UTC (rev
77321)
Property changes on: brlcad/branches/thirdparty_rework/doc
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
/brlcad/branches/osg/doc:62110-62113
/brlcad/branches/prep-cache/doc:68236-68933
/brlcad/branches/tcltk86/doc:68300-75257
-/brlcad/trunk/doc:75098-75115,75241-77302
\ No newline at end of property
+/brlcad/trunk/doc:75098-75115,75241-77320
\ No newline at end of property
Modified: brlcad/branches/thirdparty_rework/doc/README.Windows
===================================================================
--- brlcad/branches/thirdparty_rework/doc/README.Windows 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/doc/README.Windows 2020-10-02
13:26:00 UTC (rev 77321)
@@ -86,6 +86,18 @@
look for Windows SDK installs in the "Apps & Features" Setup
interface.
+=======================================================
+
+=== Tracking down the source of a header inclusion ===
+
+If a Windows system header is reporting an error, it can be helpful to
+identify where the header is being included from. By default MSVC
+doesn't report this, but in Visual Studio there is a "ShowIncludes"
+setting that may be enabled to find this information:
+
+https://stackoverflow.com/a/1138045
+
+
===========================================
=== Notes on Visual Studio 14 2015 ===
Modified: brlcad/branches/thirdparty_rework/doc/legal/embedded/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/doc/legal/embedded/CMakeLists.txt
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/doc/legal/embedded/CMakeLists.txt
2020-10-02 13:26:00 UTC (rev 77321)
@@ -23,6 +23,7 @@
gecode.txt
gdal_gcv_plugin1.txt
gdal_gcv_plugin2.txt
+ gdiam.txt
halfedge.txt
humanize.txt
hv3.txt
@@ -70,6 +71,7 @@
tkcon.txt
tri_pt.txt
uce_dirent.txt
+ vds.txt
whereami.txt
winmmap.txt
x24.txt
Modified: brlcad/branches/thirdparty_rework/doc/legal/embedded/SPSR.txt
===================================================================
--- brlcad/branches/thirdparty_rework/doc/legal/embedded/SPSR.txt
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/doc/legal/embedded/SPSR.txt
2020-10-02 13:26:00 UTC (rev 77321)
@@ -85,49 +85,41 @@
reason for such modification.
file:/include/bg/spsr.h
-file:/src/other/libspsr/Src/Allocator.h
-file:/src/other/libspsr/Src/Array.h
-file:/src/other/libspsr/Src/Array.inl
-file:/src/other/libspsr/Src/BSplineData.h
-file:/src/other/libspsr/Src/BSplineData.inl
-file:/src/other/libspsr/Src/BinaryNode.h
-file:/src/other/libspsr/Src/CmdLineParser.cpp
-file:/src/other/libspsr/Src/CmdLineParser.h
-file:/src/other/libspsr/Src/CmdLineParser.inl
-file:/src/other/libspsr/Src/Factor.cpp
-file:/src/other/libspsr/Src/Factor.h
-file:/src/other/libspsr/Src/FunctionData.h
-file:/src/other/libspsr/Src/FunctionData.inl
-file:/src/other/libspsr/Src/Geometry.cpp
-file:/src/other/libspsr/Src/Geometry.h
-file:/src/other/libspsr/Src/Geometry.inl
-file:/src/other/libspsr/Src/Hash.h
-file:/src/other/libspsr/Src/MAT.h
-file:/src/other/libspsr/Src/MAT.inl
-file:/src/other/libspsr/Src/MarchingCubes.cpp
-file:/src/other/libspsr/Src/MarchingCubes.h
-file:/src/other/libspsr/Src/MemoryUsage.h
-file:/src/other/libspsr/Src/MultiGridOctreeData.IsoSurface.inl
-file:/src/other/libspsr/Src/MultiGridOctreeData.SortedTreeNodes.inl
-file:/src/other/libspsr/Src/MultiGridOctreeData.h
-file:/src/other/libspsr/Src/MultiGridOctreeData.inl
-file:/src/other/libspsr/Src/MyTime.h
-file:/src/other/libspsr/Src/Octree.h
-file:/src/other/libspsr/Src/Octree.inl
-file:/src/other/libspsr/Src/PPolynomial.h
-file:/src/other/libspsr/Src/PPolynomial.inl
-file:/src/other/libspsr/Src/PlyVertexMini.h
-file:/src/other/libspsr/Src/PointStream.h
-file:/src/other/libspsr/Src/PointStream.inl
-file:/src/other/libspsr/Src/PoissonRecon.cpp
-file:/src/other/libspsr/Src/Polynomial.h
-file:/src/other/libspsr/Src/Polynomial.inl
-file:/src/other/libspsr/Src/SPSR.cpp
-file:/src/other/libspsr/Src/SPSR.h
-file:/src/other/libspsr/Src/SparseMatrix.h
-file:/src/other/libspsr/Src/SparseMatrix.inl
-file:/src/other/libspsr/Src/SurfaceTrimmer.cpp
-file:/src/other/libspsr/Src/Vector.h
-file:/src/other/libspsr/Src/Vector.inl
-file:/src/other/libspsr/Src/cvertex.h
+file:/src/libbg/spsr/Allocator.h
+file:/src/libbg/spsr/Array.h
+file:/src/libbg/spsr/Array.inl
+file:/src/libbg/spsr/BSplineData.h
+file:/src/libbg/spsr/BSplineData.inl
+file:/src/libbg/spsr/BinaryNode.h
+file:/src/libbg/spsr/Factor.cpp
+file:/src/libbg/spsr/Factor.h
+file:/src/libbg/spsr/FunctionData.h
+file:/src/libbg/spsr/FunctionData.inl
+file:/src/libbg/spsr/Geometry.cpp
+file:/src/libbg/spsr/Geometry.h
+file:/src/libbg/spsr/Geometry.inl
+file:/src/libbg/spsr/MAT.h
+file:/src/libbg/spsr/MAT.inl
+file:/src/libbg/spsr/MarchingCubes.cpp
+file:/src/libbg/spsr/MarchingCubes.h
+file:/src/libbg/spsr/MultiGridOctreeData.IsoSurface.inl
+file:/src/libbg/spsr/MultiGridOctreeData.SortedTreeNodes.inl
+file:/src/libbg/spsr/MultiGridOctreeData.h
+file:/src/libbg/spsr/MultiGridOctreeData.inl
+file:/src/libbg/spsr/Octree.h
+file:/src/libbg/spsr/Octree.inl
+file:/src/libbg/spsr/PPolynomial.h
+file:/src/libbg/spsr/PPolynomial.inl
+file:/src/libbg/spsr/PlyVertexMini.h
+file:/src/libbg/spsr/PointStream.h
+file:/src/libbg/spsr/PointStream.inl
+file:/src/libbg/spsr/Polynomial.h
+file:/src/libbg/spsr/Polynomial.inl
+file:/src/libbg/spsr/SPSR.cpp
+file:/src/libbg/spsr/SPSR.h
+file:/src/libbg/spsr/SparseMatrix.h
+file:/src/libbg/spsr/SparseMatrix.inl
+file:/src/libbg/spsr/Vector.h
+file:/src/libbg/spsr/Vector.inl
+file:/src/libbg/spsr/cvertex.h
Copied: brlcad/branches/thirdparty_rework/doc/legal/embedded/gdiam.txt (from
rev 77320, brlcad/trunk/doc/legal/embedded/gdiam.txt)
===================================================================
--- brlcad/branches/thirdparty_rework/doc/legal/embedded/gdiam.txt
(rev 0)
+++ brlcad/branches/thirdparty_rework/doc/legal/embedded/gdiam.txt
2020-10-02 13:26:00 UTC (rev 77321)
@@ -0,0 +1,24 @@
+Copyright 2001 Sariel Har-Peled ([email protected])
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+file:/src/librt/gdiam/gdiam.cpp
+file:/src/librt/gdiam/gdiam_test.cpp
+file:/src/librt/gdiam/gdiam.hpp
+
Copied: brlcad/branches/thirdparty_rework/doc/legal/embedded/vds.txt (from rev
77320, brlcad/trunk/doc/legal/embedded/vds.txt)
===================================================================
--- brlcad/branches/thirdparty_rework/doc/legal/embedded/vds.txt
(rev 0)
+++ brlcad/branches/thirdparty_rework/doc/legal/embedded/vds.txt
2020-10-02 13:26:00 UTC (rev 77321)
@@ -0,0 +1,31 @@
+This package was debianized by Marcelo E. Magallon <[email protected]> on
+Sun, 20 Feb 2000 12:49:36 +0100.
+
+It was downloaded from http://www.cs.virginia.edu/~dwc3q/code/
+
+Upstream Author(s): Dr. David Patrick Luebke <[email protected]>
+
+Copyright:
+
+ Copyright 1999 The University of Virginia.
+ All Rights Reserved.
+
+ Permission to use, copy, modify and distribute this software and its
+ documentation without fee, and without a written agreement, is
+ hereby granted, provided that the above copyright notice and the
+ complete text of this comment appear in all copies, and provided that
+ the University of Virginia and the original authors are credited in
+ any publications arising from the use of this software.
+
+ IN NO EVENT SHALL THE UNIVERSITY OF VIRGINIA
+ OR THE AUTHOR OF THIS SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT,
+ INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
+ LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
+ DOCUMENTATION, EVEN IF THE UNIVERSITY OF VIRGINIA AND/OR THE
+ AUTHOR OF THIS SOFTWARE HAVE BEEN ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGES.
+
+Note: the polyview example is not included with the BRL-CAD copy of libvds.
+
+file:/src/librt/vds/vds.h
+file:/src/librt/vds/vds.c
Modified: brlcad/branches/thirdparty_rework/doc/legal/other/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/doc/legal/other/CMakeLists.txt
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/doc/legal/other/CMakeLists.txt
2020-10-02 13:26:00 UTC (rev 77321)
@@ -4,12 +4,10 @@
incrTcl.txt
libbson.txt
libbson_yajl.txt
- libgdiam.txt
libnetpbm.txt
libpng.txt
libregex.txt
libutahrle.txt
- libvds.txt
libz.txt
linenoise.txt
OpenNURBS.txt
Deleted: brlcad/branches/thirdparty_rework/doc/legal/other/libgdiam.txt
===================================================================
--- brlcad/branches/thirdparty_rework/doc/legal/other/libgdiam.txt
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/doc/legal/other/libgdiam.txt
2020-10-02 13:26:00 UTC (rev 77321)
@@ -1,20 +0,0 @@
-Copyright 2001 Sariel Har-Peled ([email protected])
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
Deleted: brlcad/branches/thirdparty_rework/doc/legal/other/libvds.txt
===================================================================
--- brlcad/branches/thirdparty_rework/doc/legal/other/libvds.txt
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/doc/legal/other/libvds.txt
2020-10-02 13:26:00 UTC (rev 77321)
@@ -1,28 +0,0 @@
-This package was debianized by Marcelo E. Magallon <[email protected]> on
-Sun, 20 Feb 2000 12:49:36 +0100.
-
-It was downloaded from http://www.cs.virginia.edu/~dwc3q/code/
-
-Upstream Author(s): Dr. David Patrick Luebke <[email protected]>
-
-Copyright:
-
- Copyright 1999 The University of Virginia.
- All Rights Reserved.
-
- Permission to use, copy, modify and distribute this software and its
- documentation without fee, and without a written agreement, is
- hereby granted, provided that the above copyright notice and the
- complete text of this comment appear in all copies, and provided that
- the University of Virginia and the original authors are credited in
- any publications arising from the use of this software.
-
- IN NO EVENT SHALL THE UNIVERSITY OF VIRGINIA
- OR THE AUTHOR OF THIS SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT,
- INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
- LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
- DOCUMENTATION, EVEN IF THE UNIVERSITY OF VIRGINIA AND/OR THE
- AUTHOR OF THIS SOFTWARE HAVE BEEN ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGES.
-
-Note: the polyview example is not included with the BRL-CAD copy of libvds.
Modified: brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_Targets.cmake
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_Targets.cmake
2020-10-02 13:26:00 UTC (rev 77321)
@@ -121,9 +121,9 @@
endwhile(NOT "${f_ext}" STREQUAL "")
# C++
- if(${srcfile_ext} STREQUAL ".cxx" OR ${srcfile_ext} STREQUAL ".cpp" OR
${srcfile_ext} STREQUAL ".cc")
+ if(${srcfile_ext} STREQUAL ".cxx" OR ${srcfile_ext} STREQUAL ".cpp" OR
${srcfile_ext} STREQUAL ".cc" OR ${srcfile_ext} STREQUAL ".inl")
set(file_language CXX)
- endif(${srcfile_ext} STREQUAL ".cxx" OR ${srcfile_ext} STREQUAL ".cpp" OR
${srcfile_ext} STREQUAL ".cc")
+ endif(${srcfile_ext} STREQUAL ".cxx" OR ${srcfile_ext} STREQUAL ".cpp" OR
${srcfile_ext} STREQUAL ".cc" OR ${srcfile_ext} STREQUAL ".inl")
if(${srcfile_ext} STREQUAL ".hxx" OR ${srcfile_ext} STREQUAL ".hpp" OR
${srcfile_ext} STREQUAL ".hh")
set(file_language CXX)
endif(${srcfile_ext} STREQUAL ".hxx" OR ${srcfile_ext} STREQUAL ".hpp" OR
${srcfile_ext} STREQUAL ".hh")
Modified: brlcad/branches/thirdparty_rework/misc/CMake/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/CMakeLists.txt 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/misc/CMake/CMakeLists.txt 2020-10-02
13:26:00 UTC (rev 77321)
@@ -44,7 +44,6 @@
FindTCL.cmake
FindUTAHRLE.cmake
FindUUID.cmake
- FindVDS.cmake
FindWix.cmake
FindX11.cmake
FindXMLLINT.cmake
Deleted: brlcad/branches/thirdparty_rework/misc/CMake/FindGDIAM.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/FindGDIAM.cmake
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/misc/CMake/FindGDIAM.cmake
2020-10-02 13:26:00 UTC (rev 77321)
@@ -1,102 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindGDIAM
---------
-
-Find the native GDIAM includes and library.
-
-IMPORTED Targets
-^^^^^^^^^^^^^^^^
-
-This module defines :prop_tgt:`IMPORTED` target ``GDIAM::GDIAM``, if
-GDIAM has been found.
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module defines the following variables:
-
-::
-
- GDIAM_INCLUDE_DIRS - where to find gdiam.hpp, etc.
- GDIAM_LIBRARIES - List of libraries when using gdiam.
- GDIAM_FOUND - True if gdiam found.
-
-Hints
-^^^^^
-
-A user may set ``GDIAM_ROOT`` to a gdiam installation root to tell this
-module where to look.
-#]=======================================================================]
-
-set(_GDIAM_SEARCHES)
-
-# Search GDIAM_ROOT first if it is set.
-if(GDIAM_ROOT)
- set(_GDIAM_SEARCH_ROOT PATHS ${GDIAM_ROOT} NO_DEFAULT_PATH)
- list(APPEND _GDIAM_SEARCHES _GDIAM_SEARCH_ROOT)
-endif()
-
-# Normal search.
-set(_GDIAM_x86 "(x86)")
-set(_GDIAM_SEARCH_NORMAL
- PATHS "$ENV{ProgramFiles}/gdiam"
- "$ENV{ProgramFiles${_GDIAM_x86}}/gdiam")
-unset(_GDIAM_x86)
-list(APPEND _GDIAM_SEARCHES _GDIAM_SEARCH_NORMAL)
-
-set(GDIAM_NAMES gdiam)
-
-# Try each search configuration.
-foreach(search ${_GDIAM_SEARCHES})
- find_path(GDIAM_INCLUDE_DIR NAMES gdiam.hpp ${${search}} PATH_SUFFIXES
include include/gdiam gdiam)
-endforeach()
-
-# Allow GDIAM_LIBRARY to be set manually, as the location of the gdiam library
-if(NOT GDIAM_LIBRARY)
- foreach(search ${_GDIAM_SEARCHES})
- find_library(GDIAM_LIBRARY NAMES ${GDIAM_NAMES} NAMES_PER_DIR ${${search}}
PATH_SUFFIXES lib)
- endforeach()
-endif()
-
-unset(GDIAM_NAMES)
-
-mark_as_advanced(GDIAM_INCLUDE_DIR)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GDIAM REQUIRED_VARS GDIAM_LIBRARY
GDIAM_INCLUDE_DIR)
-
-if(GDIAM_FOUND)
- set(GDIAM_INCLUDE_DIRS ${GDIAM_INCLUDE_DIR})
-
- if(NOT GDIAM_LIBRARIES)
- set(GDIAM_LIBRARIES ${GDIAM_LIBRARY})
- endif()
-
- if(NOT TARGET GDIAM::GDIAM)
- add_library(GDIAM::GDIAM UNKNOWN IMPORTED)
- set_target_properties(GDIAM::GDIAM PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${GDIAM_INCLUDE_DIRS}")
-
- if(GDIAM_LIBRARY_RELEASE)
- set_property(TARGET GDIAM::GDIAM APPEND PROPERTY
- IMPORTED_CONFIGURATIONS RELEASE)
- set_target_properties(GDIAM::GDIAM PROPERTIES
- IMPORTED_LOCATION_RELEASE "${GDIAM_LIBRARY_RELEASE}")
- endif()
-
- if(GDIAM_LIBRARY_DEBUG)
- set_property(TARGET GDIAM::GDIAM APPEND PROPERTY
- IMPORTED_CONFIGURATIONS DEBUG)
- set_target_properties(GDIAM::GDIAM PROPERTIES
- IMPORTED_LOCATION_DEBUG "${GDIAM_LIBRARY_DEBUG}")
- endif()
-
- if(NOT GDIAM_LIBRARY_RELEASE AND NOT GDIAM_LIBRARY_DEBUG)
- set_property(TARGET GDIAM::GDIAM APPEND PROPERTY
- IMPORTED_LOCATION "${GDIAM_LIBRARY}")
- endif()
- endif()
-endif()
Deleted: brlcad/branches/thirdparty_rework/misc/CMake/FindSPSR.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/FindSPSR.cmake 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/misc/CMake/FindSPSR.cmake 2020-10-02
13:26:00 UTC (rev 77321)
@@ -1,102 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindSPSR
---------
-
-Find the native SPSR includes and library.
-
-IMPORTED Targets
-^^^^^^^^^^^^^^^^
-
-This module defines :prop_tgt:`IMPORTED` target ``SPSR::SPSR``, if
-SPSR has been found.
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module defines the following variables:
-
-::
-
- SPSR_INCLUDE_DIRS - where to find SPSR.h, etc.
- SPSR_LIBRARIES - List of libraries when using spsr.
- SPSR_FOUND - True if spsr found.
-
-Hints
-^^^^^
-
-A user may set ``SPSR_ROOT`` to a spsr installation root to tell this
-module where to look.
-#]=======================================================================]
-
-set(_SPSR_SEARCHES)
-
-# Search SPSR_ROOT first if it is set.
-if(SPSR_ROOT)
- set(_SPSR_SEARCH_ROOT PATHS ${SPSR_ROOT} NO_DEFAULT_PATH)
- list(APPEND _SPSR_SEARCHES _SPSR_SEARCH_ROOT)
-endif()
-
-# Normal search.
-set(_SPSR_x86 "(x86)")
-set(_SPSR_SEARCH_NORMAL
- PATHS "$ENV{ProgramFiles}/spsr"
- "$ENV{ProgramFiles${_SPSR_x86}}/spsr")
-unset(_SPSR_x86)
-list(APPEND _SPSR_SEARCHES _SPSR_SEARCH_NORMAL)
-
-set(SPSR_NAMES spsr SPSR)
-
-# Try each search configuration.
-foreach(search ${_SPSR_SEARCHES})
- find_path(SPSR_INCLUDE_DIR NAMES SPSR.h ${${search}} PATH_SUFFIXES
include include/SPSR SPSR)
-endforeach()
-
-# Allow SPSR_LIBRARY to be set manually, as the location of the spsr library
-if(NOT SPSR_LIBRARY)
- foreach(search ${_SPSR_SEARCHES})
- find_library(SPSR_LIBRARY NAMES ${SPSR_NAMES} NAMES_PER_DIR ${${search}}
PATH_SUFFIXES lib)
- endforeach()
-endif()
-
-unset(SPSR_NAMES)
-
-mark_as_advanced(SPSR_INCLUDE_DIR)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SPSR REQUIRED_VARS SPSR_LIBRARY
SPSR_INCLUDE_DIR)
-
-if(SPSR_FOUND)
- set(SPSR_INCLUDE_DIRS ${SPSR_INCLUDE_DIR})
-
- if(NOT SPSR_LIBRARIES)
- set(SPSR_LIBRARIES ${SPSR_LIBRARY})
- endif()
-
- if(NOT TARGET SPSR::SPSR)
- add_library(SPSR::SPSR UNKNOWN IMPORTED)
- set_target_properties(SPSR::SPSR PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${SPSR_INCLUDE_DIRS}")
-
- if(SPSR_LIBRARY_RELEASE)
- set_property(TARGET SPSR::SPSR APPEND PROPERTY
- IMPORTED_CONFIGURATIONS RELEASE)
- set_target_properties(SPSR::SPSR PROPERTIES
- IMPORTED_LOCATION_RELEASE "${SPSR_LIBRARY_RELEASE}")
- endif()
-
- if(SPSR_LIBRARY_DEBUG)
- set_property(TARGET SPSR::SPSR APPEND PROPERTY
- IMPORTED_CONFIGURATIONS DEBUG)
- set_target_properties(SPSR::SPSR PROPERTIES
- IMPORTED_LOCATION_DEBUG "${SPSR_LIBRARY_DEBUG}")
- endif()
-
- if(NOT SPSR_LIBRARY_RELEASE AND NOT SPSR_LIBRARY_DEBUG)
- set_property(TARGET SPSR::SPSR APPEND PROPERTY
- IMPORTED_LOCATION "${SPSR_LIBRARY}")
- endif()
- endif()
-endif()
Deleted: brlcad/branches/thirdparty_rework/misc/CMake/FindVDS.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/FindVDS.cmake 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/misc/CMake/FindVDS.cmake 2020-10-02
13:26:00 UTC (rev 77321)
@@ -1,102 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindVDS
---------
-
-Find the native VDS includes and library.
-
-IMPORTED Targets
-^^^^^^^^^^^^^^^^
-
-This module defines :prop_tgt:`IMPORTED` target ``VDS::VDS``, if
-VDS has been found.
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module defines the following variables:
-
-::
-
- VDS_INCLUDE_DIRS - where to find vds.h, etc.
- VDS_LIBRARIES - List of libraries when using vds.
- VDS_FOUND - True if vds found.
-
-Hints
-^^^^^
-
-A user may set ``VDS_ROOT`` to a vds installation root to tell this
-module where to look.
-#]=======================================================================]
-
-set(_VDS_SEARCHES)
-
-# Search VDS_ROOT first if it is set.
-if(VDS_ROOT)
- set(_VDS_SEARCH_ROOT PATHS ${VDS_ROOT} NO_DEFAULT_PATH)
- list(APPEND _VDS_SEARCHES _VDS_SEARCH_ROOT)
-endif()
-
-# Normal search.
-set(_VDS_x86 "(x86)")
-set(_VDS_SEARCH_NORMAL
- PATHS "$ENV{ProgramFiles}/vds"
- "$ENV{ProgramFiles${_VDS_x86}}/vds")
-unset(_VDS_x86)
-list(APPEND _VDS_SEARCHES _VDS_SEARCH_NORMAL)
-
-set(VDS_NAMES vds)
-
-# Try each search configuration.
-foreach(search ${_VDS_SEARCHES})
- find_path(VDS_INCLUDE_DIR NAMES vds.h ${${search}} PATH_SUFFIXES include
include/vds vds)
-endforeach()
-
-# Allow VDS_LIBRARY to be set manually, as the location of the vds library
-if(NOT VDS_LIBRARY)
- foreach(search ${_VDS_SEARCHES})
- find_library(VDS_LIBRARY NAMES ${VDS_NAMES} NAMES_PER_DIR ${${search}}
PATH_SUFFIXES lib)
- endforeach()
-endif()
-
-unset(VDS_NAMES)
-
-mark_as_advanced(VDS_INCLUDE_DIR)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VDS REQUIRED_VARS VDS_LIBRARY
VDS_INCLUDE_DIR)
-
-if(VDS_FOUND)
- set(VDS_INCLUDE_DIRS ${VDS_INCLUDE_DIR})
-
- if(NOT VDS_LIBRARIES)
- set(VDS_LIBRARIES ${VDS_LIBRARY})
- endif()
-
- if(NOT TARGET VDS::VDS)
- add_library(VDS::VDS UNKNOWN IMPORTED)
- set_target_properties(VDS::VDS PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${VDS_INCLUDE_DIRS}")
-
- if(VDS_LIBRARY_RELEASE)
- set_property(TARGET VDS::VDS APPEND PROPERTY
- IMPORTED_CONFIGURATIONS RELEASE)
- set_target_properties(VDS::VDS PROPERTIES
- IMPORTED_LOCATION_RELEASE "${VDS_LIBRARY_RELEASE}")
- endif()
-
- if(VDS_LIBRARY_DEBUG)
- set_property(TARGET VDS::VDS APPEND PROPERTY
- IMPORTED_CONFIGURATIONS DEBUG)
- set_target_properties(VDS::VDS PROPERTIES
- IMPORTED_LOCATION_DEBUG "${VDS_LIBRARY_DEBUG}")
- endif()
-
- if(NOT VDS_LIBRARY_RELEASE AND NOT VDS_LIBRARY_DEBUG)
- set_property(TARGET VDS::VDS APPEND PROPERTY
- IMPORTED_LOCATION "${VDS_LIBRARY}")
- endif()
- endif()
-endif()
Modified: brlcad/branches/thirdparty_rework/misc/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMakeLists.txt 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/misc/CMakeLists.txt 2020-10-02
13:26:00 UTC (rev 77321)
@@ -79,13 +79,6 @@
check/volume.sh
check/gap.sh
clang-static-analyzer-run.sh
- external_build_testing/CMakeLists.txt
- external_build_testing/CMake/buildpath_replace.cxx.in
- external_build_testing/CMake/Path_Setup.cmake
- external_build_testing/CMake/rpath_replace.cxx.in
- external_build_testing/CMake/RPath_Setup.cmake
- external_build_testing/CMake/ExternalProject_Target.cmake
- external_build_testing/NOTES
flawfinder
hawaii_islands.sh
jove.emacs
Modified: brlcad/branches/thirdparty_rework/misc/win32-msvc/Dll/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/misc/win32-msvc/Dll/CMakeLists.txt
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/misc/win32-msvc/Dll/CMakeLists.txt
2020-10-02 13:26:00 UTC (rev 77321)
@@ -38,12 +38,10 @@
libbn-static
libbrep-static
libbu-static
- gdiam-static
libged-static
regex-static
librt-static
libbrep-static
- vds-static
libwdb-static
libnmg-static
poly2tri-static
@@ -119,12 +117,10 @@
libbn-static
libbrep-static
libbu-static
- gdiam-static
libged-static
regex-static
librt-static
libbrep-static
- vds-static
libwdb-static
libnmg-static
poly2tri-static
Modified: brlcad/branches/thirdparty_rework/src/external/Creo/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/external/Creo/CMakeLists.txt
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/external/Creo/CMakeLists.txt
2020-10-02 13:26:00 UTC (rev 77321)
@@ -38,7 +38,7 @@
set(CREO_DEFS "-DPRO_MACHINE=36 -DPRO_OS=4 -DPRO_USE_VAR_ARGS
-D_USING_V100_SDK71_")
# BRL-CAD definitions
- set(BRLCAD_DEFS "-DHAVE_CONFIG_H -DBRLCAD_DLL -DBRLCADBUILD -DBU_DLL_IMPORTS
-DBN_DLL_IMPORTS -DNMG_DLL_IMPORTS -DBG_DLL_IMPORTS -DBREP_DLL_IMPORTS
-DRT_DLL_IMPORTS -DWDB_DLL_IMPORTS -DTIE_DLL_IMPORTS -DDB5_DLL_IMPORTS
-DVDS_DLL_IMPORTS -DGDIAM_DLL_IMPORTS -DON_DLL_IMPORTS -DLZ4_DLL_IMPORT=1")
+ set(BRLCAD_DEFS "-DHAVE_CONFIG_H -DBRLCAD_DLL -DBRLCADBUILD -DBU_DLL_IMPORTS
-DBN_DLL_IMPORTS -DNMG_DLL_IMPORTS -DBG_DLL_IMPORTS -DBREP_DLL_IMPORTS
-DRT_DLL_IMPORTS -DWDB_DLL_IMPORTS -DTIE_DLL_IMPORTS -DDB5_DLL_IMPORTS
-DON_DLL_IMPORTS")
# These settings are global to all the configs.
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CREO_DEFS} ${BRLCAD_DEFS}" CACHE
STRING "" FORCE)
@@ -207,12 +207,9 @@
libnmg
librt
libwdb
- SPSR
- gdiam
openNURBS
poly2tri
regex_brl
- vds
z_brl1
)
set(BRLCAD_STATIC_LIBS)
@@ -295,7 +292,6 @@
configure_file(creo-brl.dat.in
${CMAKE_CURRENT_BINARY_DIR}/${CFG_TYPE}/creo-brl-debug.dat @ONLY)
endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
set_property(TARGET creo-brl-exe APPEND PROPERTY COMPILE_DEFINITIONS
"TINYCTHREAD_DLL_IMPORTS")
- set_property(TARGET creo-brl-exe APPEND PROPERTY COMPILE_DEFINITIONS
"SPSR_DLL_IMPORTS")
endif(DEFINED CREO_EXEC_PLUGIN)
# Install the resource files
@@ -372,10 +368,7 @@
set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"DB5_DLL_IMPORTS")
set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"WDB_DLL_IMPORTS")
set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"TIE_DLL_IMPORTS")
- set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_IMPORTS")
- set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
- set_property(TARGET creo-brl APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
endif(HIDE_INTERNAL_SYMBOLS)
# Distcheck file list
Modified: brlcad/branches/thirdparty_rework/src/external/Cubit/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/external/Cubit/CMakeLists.txt
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/external/Cubit/CMakeLists.txt
2020-10-02 13:26:00 UTC (rev 77321)
@@ -35,11 +35,8 @@
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"DB5_DLL_IMPORTS")
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"WDB_DLL_IMPORTS")
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"TIE_DLL_IMPORTS")
- set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_IMPORTS")
- set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"TINYCTHREAD_DLL_IMPORTS")
- set_property(TARGET g-sat APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
endif(HIDE_INTERNAL_SYMBOLS)
CMAKEFILES(${g_sat_srcs} shim.h)
Modified:
brlcad/branches/thirdparty_rework/src/external/Unigraphics/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/external/Unigraphics/CMakeLists.txt
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/external/Unigraphics/CMakeLists.txt
2020-10-02 13:26:00 UTC (rev 77321)
@@ -40,11 +40,8 @@
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"DB5_DLL_IMPORTS")
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"WDB_DLL_IMPORTS")
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"TIE_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_IMPORTS")
set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"TINYCTHREAD_DLL_IMPORTS")
- set_property(TARGET ug-g APPEND PROPERTY COMPILE_DEFINITIONS
"LZ4_DLL_IMPORT=1")
endif(HIDE_INTERNAL_SYMBOLS)
endif (BRLCAD_ENABLE_TCL)
Modified: brlcad/branches/thirdparty_rework/src/libbg/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/libbg/CMakeLists.txt 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/libbg/CMakeLists.txt 2020-10-02
13:26:00 UTC (rev 77321)
@@ -9,6 +9,46 @@
)
BRLCAD_LIB_INCLUDE_DIRS(bg BG_INCLUDE_DIRS "")
+set(SPSR_srcs
+ spsr/Allocator.h
+ spsr/Array.h
+ spsr/Array.inl
+ spsr/BinaryNode.h
+ spsr/BSplineData.h
+ spsr/BSplineData.inl
+ spsr/cvertex.h
+ spsr/Factor.cpp
+ spsr/Factor.h
+ spsr/FunctionData.h
+ spsr/FunctionData.inl
+ spsr/Geometry.cpp
+ spsr/Geometry.h
+ spsr/Geometry.inl
+ spsr/MarchingCubes.cpp
+ spsr/MarchingCubes.h
+ spsr/MAT.h
+ spsr/MAT.inl
+ spsr/MultiGridOctreeData.h
+ spsr/MultiGridOctreeData.inl
+ spsr/MultiGridOctreeData.IsoSurface.inl
+ spsr/MultiGridOctreeData.SortedTreeNodes.inl
+ spsr/Octree.h
+ spsr/Octree.inl
+ spsr/PlyVertexMini.h
+ spsr/PointStream.h
+ spsr/PointStream.inl
+ spsr/Polynomial.h
+ spsr/Polynomial.inl
+ spsr/PPolynomial.h
+ spsr/PPolynomial.inl
+ spsr/SparseMatrix.h
+ spsr/SparseMatrix.inl
+ spsr/SPSR.cpp
+ spsr/SPSR.h
+ spsr/Vector.h
+ spsr/Vector.inl
+ )
+
set(LIBBG_SOURCES
aabb_ray.c
chull.c
@@ -24,6 +64,7 @@
polygon_triangulate.cpp
polygon_point_in.c
spsr.c
+ ${SPSR_srcs}
tri_pt.c
tri_ray.c
tri_tri.c
@@ -32,15 +73,13 @@
util.c
)
-BRLCAD_ADDLIB(libbg "${LIBBG_SOURCES}"
"libbn;libbu;${SPSR_LIBRARY};${POLY2TRI_LIBRARY}")
+BRLCAD_ADDLIB(libbg "${LIBBG_SOURCES}" "libbn;libbu;${POLY2TRI_LIBRARY}")
set_target_properties(libbg PROPERTIES VERSION 20.0.1 SOVERSION 20)
if (HIDE_INTERNAL_SYMBOLS)
- set_property(TARGET libbg APPEND PROPERTY COMPILE_DEFINITIONS
"SPSR_DLL_IMPORTS")
if (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
set_property(TARGET libbg APPEND PROPERTY COMPILE_DEFINITIONS
"P2T_DLL_IMPORTS")
endif (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
if (TARGET libbg-obj)
- set_property(TARGET libbg-obj APPEND PROPERTY COMPILE_DEFINITIONS
"SPSR_DLL_IMPORTS")
if (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
set_property(TARGET libbg-obj APPEND PROPERTY COMPILE_DEFINITIONS
"P2T_DLL_IMPORTS")
endif (TARGET poly2tri OR HIDE_INTERNAL_SYMBOLS_EXT)
@@ -56,6 +95,7 @@
delaunator.hpp
earcut.hpp
pointgen.c
+ spsr/LICENSE
)
CMAKEFILES(${bg_ignore})
@@ -67,3 +107,4 @@
# indent-tabs-mode: t
# End:
# ex: shiftwidth=2 tabstop=8
+
Modified: brlcad/branches/thirdparty_rework/src/libbg/spsr.c
===================================================================
--- brlcad/branches/thirdparty_rework/src/libbg/spsr.c 2020-10-02 12:43:17 UTC
(rev 77320)
+++ brlcad/branches/thirdparty_rework/src/libbg/spsr.c 2020-10-02 13:26:00 UTC
(rev 77321)
@@ -27,7 +27,7 @@
#include "bu/log.h"
#include "bu/malloc.h"
#include "bg/spsr.h"
-#include "../other/libspsr/Src/SPSR.h"
+#include "./spsr/SPSR.h"
struct c_vert {
point_t p;
Modified: brlcad/branches/thirdparty_rework/src/librt/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/librt/CMakeLists.txt 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/librt/CMakeLists.txt 2020-10-02
13:26:00 UTC (rev 77321)
@@ -19,8 +19,8 @@
set(RT_LOCAL_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}
${REGEX_INCLUDE_DIR}
- ${VDS_INCLUDE_DIR}
- ${GDIAM_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/vds
+ ${CMAKE_CURRENT_SOURCE_DIR}/gdiam
)
BRLCAD_LIB_INCLUDE_DIRS(rt RT_INCLUDE_DIRS RT_LOCAL_INCLUDE_DIRS)
@@ -67,6 +67,7 @@
dir.c
dspline.c
fortray.c
+ gdiam/gdiam.cpp
globals.c
htbl.c
ls.c
@@ -218,6 +219,7 @@
transform.c
tree.c
uv.c
+ vds/vds.c
vers.c
vlist.c
vshoot.c
@@ -361,27 +363,15 @@
set(SPR_LIB ${SPSR_LIBRARY})
endif(BRLCAD_ENABLE_SPR)
-BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}"
"${OPENCL_LIBS};${GDIAM_LIBRARY};${VDS_LIBRARY};libbrep;libnmg;libbg;libbn;libbu;${OPENNURBS_LIBRARY};${SPR_LIB};${REGEX_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}")
+BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}"
"${OPENCL_LIBS};libbrep;libnmg;libbg;libbn;libbu;${OPENNURBS_LIBRARY};${REGEX_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}")
set_target_properties(librt PROPERTIES VERSION 20.0.1 SOVERSION 20)
if(HIDE_INTERNAL_SYMBOLS)
set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"TIE_DLL_EXPORTS")
set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"DB5_DLL_EXPORTS")
- if(TARGET vds OR HIDE_INTERNAL_SYMBOLS_EXT)
- set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
- endif(TARGET vds OR HIDE_INTERNAL_SYMBOLS_EXT)
- if(TARGET gdiam OR HIDE_INTERNAL_SYMBOLS_EXT)
- set_property(TARGET librt APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_IMPORTS")
- endif(TARGET gdiam OR HIDE_INTERNAL_SYMBOLS_EXT)
if (TARGET librt-obj)
set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"TIE_DLL_EXPORTS")
set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"DB5_DLL_EXPORTS")
- if(TARGET vds OR HIDE_INTERNAL_SYMBOLS_EXT)
- set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_IMPORTS")
- endif(TARGET vds OR HIDE_INTERNAL_SYMBOLS_EXT)
- if(TARGET gdiam OR HIDE_INTERNAL_SYMBOLS_EXT)
- set_property(TARGET librt-obj APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_IMPORTS")
- endif(TARGET gdiam OR HIDE_INTERNAL_SYMBOLS_EXT)
endif (TARGET librt-obj)
endif(HIDE_INTERNAL_SYMBOLS)
@@ -404,6 +394,13 @@
CMAKEFILES(
CMakeLists.txt
db_fp.cpp
+ vds/README
+ vds/COPYING
+ vds/vds.h
+ gdiam/gdiam.hpp
+ gdiam/gdiam_test.cpp
+ gdiam/LICENSE.MIT
+ gdiam/README
)
# Local Variables:
Index: brlcad/branches/thirdparty_rework/src/other
===================================================================
--- brlcad/branches/thirdparty_rework/src/other 2020-10-02 12:43:17 UTC (rev
77320)
+++ brlcad/branches/thirdparty_rework/src/other 2020-10-02 13:26:00 UTC (rev
77321)
Property changes on: brlcad/branches/thirdparty_rework/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
/brlcad/branches/osg/src/other:62110-62113
/brlcad/branches/prep-cache/src/other:68236-68933
/brlcad/branches/tcltk86/src/other:68300-75257
-/brlcad/trunk/src/other:75098-75115,75241-77302
\ No newline at end of property
+/brlcad/trunk/src/other:75098-75115,75241-77320
\ No newline at end of property
Modified: brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-10-02
13:26:00 UTC (rev 77321)
@@ -73,10 +73,7 @@
find_package(NETPBM)
find_package(UTAHRLE)
find_package(OPENNURBS)
-find_package(SPSR)
find_package(STEPCODE)
-find_package(VDS)
-find_package(GDIAM)
find_package(POLY2TRI)
# For testing set(BRLCAD_ENABLE_BINARY_ATTRIBUTES ON)
Deleted: brlcad/branches/thirdparty_rework/src/other/libgdiam.dist
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/libgdiam.dist 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/other/libgdiam.dist 2020-10-02
13:26:00 UTC (rev 77321)
@@ -1,8 +0,0 @@
-set(libgdiam_ignore_files
-CMakeLists.txt
-LICENSE.MIT
-README
-gdiam.cpp
-gdiam.hpp
-gdiam_test.cpp
-)
Deleted: brlcad/branches/thirdparty_rework/src/other/libspsr.dist
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/libspsr.dist 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/other/libspsr.dist 2020-10-02
13:26:00 UTC (rev 77321)
@@ -1,49 +0,0 @@
-set(libspsr_ignore_files
-CMakeLists.txt
-LICENSE
-Src/Allocator.h
-Src/Array.h
-Src/Array.inl
-Src/BSplineData.h
-Src/BSplineData.inl
-Src/BinaryNode.h
-Src/CmdLineParser.cpp
-Src/CmdLineParser.h
-Src/CmdLineParser.inl
-Src/Factor.cpp
-Src/Factor.h
-Src/FunctionData.h
-Src/FunctionData.inl
-Src/Geometry.cpp
-Src/Geometry.h
-Src/Geometry.inl
-Src/Hash.h
-Src/MAT.h
-Src/MAT.inl
-Src/MarchingCubes.cpp
-Src/MarchingCubes.h
-Src/MemoryUsage.h
-Src/MultiGridOctreeData.IsoSurface.inl
-Src/MultiGridOctreeData.SortedTreeNodes.inl
-Src/MultiGridOctreeData.h
-Src/MultiGridOctreeData.inl
-Src/MyTime.h
-Src/Octree.h
-Src/Octree.inl
-Src/PPolynomial.h
-Src/PPolynomial.inl
-Src/PlyVertexMini.h
-Src/PointStream.h
-Src/PointStream.inl
-Src/PoissonRecon.cpp
-Src/Polynomial.h
-Src/Polynomial.inl
-Src/SPSR.cpp
-Src/SPSR.h
-Src/SparseMatrix.h
-Src/SparseMatrix.inl
-Src/SurfaceTrimmer.cpp
-Src/Vector.h
-Src/Vector.inl
-Src/cvertex.h
-)
Deleted: brlcad/branches/thirdparty_rework/src/other/libvds.dist
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/libvds.dist 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/other/libvds.dist 2020-10-02
13:26:00 UTC (rev 77321)
@@ -1,7 +0,0 @@
-set(libvds_ignore_files
-CMakeLists.txt
-COPYING
-README
-vds.c
-vds.h
-)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-02 13:26:00 UTC (rev 77321)
@@ -150,18 +150,9 @@
# openNURBS - Non-Uniform Rational B-Spline support
include(${CMAKE_CURRENT_SOURCE_DIR}/openNURBS.cmake)
-# Screened Poisson Reconstruction Library
-include(${CMAKE_CURRENT_SOURCE_DIR}/spsr.cmake)
-
# STEPcode - support for reading and writing STEP files
include(${CMAKE_CURRENT_SOURCE_DIR}/stepcode.cmake)
-# VDSlib - A View-Dependent Simplification and Rendering Library
-include(${CMAKE_CURRENT_SOURCE_DIR}/vds.cmake)
-
-# gdiam - approximate tight bounding boxes
-include(${CMAKE_CURRENT_SOURCE_DIR}/gdiam.cmake)
-
# Poly2Tri - 2D constrained Delaunay triangulation
include(${CMAKE_CURRENT_SOURCE_DIR}/poly2tri.cmake)
@@ -200,10 +191,7 @@
NETPBM
UTAHRLE
OPENNURBS
- SPSR
STEPCODE
- VDS
- GDIAM
POLY2TRI
BSON
PROJ4
@@ -271,6 +259,8 @@
)
endif()
+#install(CODE "execute_process(COMMAND ${CMAKE_COMMAND}
-DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\"
-DCMAKE_BINARY_DIR=\"${CMAKE_BINARY_DIR}\"
-DCMAKE_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\" -P
\"${CMAKE_CURRENT_SOURCE_DIR}/brlcad.cmake\")")
+
# Local Variables:
# tab-width: 8
# mode: cmake
Deleted: brlcad/branches/thirdparty_rework/src/superbuild/gdiam.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/gdiam.cmake
2020-10-02 12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/superbuild/gdiam.cmake
2020-10-02 13:26:00 UTC (rev 77321)
@@ -1,46 +0,0 @@
-set(libgdiam_DESCRIPTION "
-Option for enabling and disabling compilation of the libgdiam approximate
-tight bounding box 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.
-")
-THIRD_PARTY(libgdiam GDIAM libgdiam libgdiam_DESCRIPTION ALIASES ENABLE_GDIAM
FLAGS NOSYS)
-
-if (${CMAKE_PROJECT_NAME}_GDIAM_BUILD)
-
- if (MSVC)
- set(GDIAM_BASENAME gdiam)
- else (MSVC)
- set(GDIAM_BASENAME libgdiam)
- endif (MSVC)
-
- ExternalProject_Add(GDIAM_BLD
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../other/libgdiam"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
- -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
- )
- ExternalProject_Target(gdiam GDIAM_BLD
- OUTPUT_FILE ${GDIAM_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
- STATIC_OUTPUT_FILE ${GDIAM_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- RPATH
- )
-
- ExternalProject_ByProducts(GDIAM_BLD ${INCLUDE_DIR}
- gdiam.hpp
- )
-
- list(APPEND BRLCAD_DEPS GDIAM_BLD)
-
- SetTargetFolder(GDIAM_BLD "Third Party Libraries")
-
-endif (${CMAKE_PROJECT_NAME}_GDIAM_BUILD)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-
Deleted: brlcad/branches/thirdparty_rework/src/superbuild/spsr.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/spsr.cmake 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/superbuild/spsr.cmake 2020-10-02
13:26:00 UTC (rev 77321)
@@ -1,50 +0,0 @@
-set(spsr_DESCRIPTION "
-Option for enabling and disabling compilation of the Screened Poisson
-Surface Reconstruction 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.
-")
-THIRD_PARTY(libspsr SPSR libspsr spsr_DESCRIPTION ALIASES ENABLE_SPSR FLAGS
NOSYS)
-
-if (${CMAKE_PROJECT_NAME}_SPSR_BUILD)
-
- if (MSVC)
- set(SPSR_BASENAME SPSR)
- else (MSVC)
- set(SPSR_BASENAME libSPSR)
- endif (MSVC)
-
- ExternalProject_Add(SPSR_BLD
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../other/libspsr"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
- -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
- )
- ExternalProject_Target(spsr SPSR_BLD
- OUTPUT_FILE ${SPSR_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
- STATIC_OUTPUT_FILE ${SPSR_BASENAME}-static${CMAKE_STATIC_LIBRARY_SUFFIX}
- RPATH
- )
-
- ExternalProject_ByProducts(SPSR_BLD ${INCLUDE_DIR}
- SPSR/SPSR.h
- SPSR/cvertex.h
- )
-
- set(SPSR_LIBRARIES spsr CACHE STRING "Building bundled spsr" FORCE)
- set(SPSR_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}/spsr" CACHE STRING
"Directory containing spsr headers." FORCE)
-
- list(APPEND BRLCAD_DEPS SPSR_BLD)
-
- SetTargetFolder(SPSR_BLD "Third Party Libraries")
- SetTargetFolder(spsr "Third Party Libraries")
-
-endif (${CMAKE_PROJECT_NAME}_SPSR_BUILD)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-
Deleted: brlcad/branches/thirdparty_rework/src/superbuild/vds.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/vds.cmake 2020-10-02
12:43:17 UTC (rev 77320)
+++ brlcad/branches/thirdparty_rework/src/superbuild/vds.cmake 2020-10-02
13:26:00 UTC (rev 77321)
@@ -1,55 +0,0 @@
-# For the moment, this is marked NOSYS - it's possible that some Debian
-# systems would have 0.9 of vdslib installed, but it's unmaintained and we're
-# likely to be making changes. If our own copy of VDSlib ever spins back off
-# into its own project, revisit the NOSYS
-
-set(libvds_DESCRIPTION "
-Option for enabling and disabling compilation of the libvds triangle
-simplification 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.
-")
-THIRD_PARTY(libvds VDS libvds libvds_DESCRIPTION ALIASES ENABLE_VDS FLAGS
NOSYS)
-
-if (${CMAKE_PROJECT_NAME}_VDS_BUILD)
-
- if (MSVC)
- set(VDS_BASENAME vds)
- else (MSVC)
- set(VDS_BASENAME libvds)
- endif (MSVC)
-
-
- ExternalProject_Add(VDS_BLD
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../other/libvds"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
- -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
- )
- ExternalProject_Target(vds VDS_BLD
- OUTPUT_FILE ${VDS_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
- STATIC_OUTPUT_FILE ${VDS_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- RPATH
- )
-
- ExternalProject_ByProducts(VDS_BLD ${INCLUDE_DIR}
- vds.h
- )
-
- set(VDS_LIBRARIES vds CACHE STRING "Building bundled netpbm" FORCE)
- set(VDS_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}" CACHE STRING
"Directory containing vds headers." FORCE)
-
- list(APPEND BRLCAD_DEPS VDS_BLD)
-
- SetTargetFolder(VDS_BLD "Third Party Libraries")
-
-endif (${CMAKE_PROJECT_NAME}_VDS_BUILD)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-
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
