Revision: 75928
http://sourceforge.net/p/brlcad/code/75928
Author: starseeker
Date: 2020-05-25 18:29:31 +0000 (Mon, 25 May 2020)
Log Message:
-----------
Merged changes from trunk through r75926
Modified Paths:
--------------
brlcad/branches/bioh/HACKING
brlcad/branches/bioh/misc/CMake/CMakeLists.txt
brlcad/branches/bioh/misc/CMake/FindTCL.cmake
brlcad/branches/bioh/src/libbu/realpath_bsd.c
brlcad/branches/bioh/src/libgcv/plugins/obj/obj_read.c
brlcad/branches/bioh/src/libged/bot/extrude.cpp
brlcad/branches/bioh/src/librt/primitives/sketch/sketch.c
brlcad/branches/bioh/src/other/CMakeLists.txt
Removed Paths:
-------------
brlcad/branches/bioh/misc/CMake/FindFontconfig.cmake
brlcad/branches/bioh/misc/CMake/FindGDAL.cmake
Property Changed:
----------------
brlcad/branches/bioh/
brlcad/branches/bioh/include/
brlcad/branches/bioh/regress/
brlcad/branches/bioh/src/libbu/
brlcad/branches/bioh/src/other/
brlcad/branches/bioh/src/other/stepcode/
Index: brlcad/branches/bioh
===================================================================
--- brlcad/branches/bioh 2020-05-25 18:28:45 UTC (rev 75927)
+++ brlcad/branches/bioh 2020-05-25 18:29:31 UTC (rev 75928)
Property changes on: brlcad/branches/bioh
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:75720-75890
\ No newline at end of property
+/brlcad/trunk:75720-75926
\ No newline at end of property
Modified: brlcad/branches/bioh/HACKING
===================================================================
--- brlcad/branches/bioh/HACKING 2020-05-25 18:28:45 UTC (rev 75927)
+++ brlcad/branches/bioh/HACKING 2020-05-25 18:29:31 UTC (rev 75928)
@@ -418,10 +418,12 @@
except in very specific cases (should be discussed with the
development team ahead of time to get consensus on the necessity.)
-There is currently no C++ interface to the core BRL-CAD libraries. If
-such an interface is eventually developed, it will be done separately
-rather than mixing C++ semantics into existing APIs.
+There is a C++ interface to the core BRL-CAD libraries called MOOSE
+that is maintained in a separate repository. It is developed with
+separation in order to avoid mixing C++ semantics into existing APIs
+and to ensure clean separation of responsibilities and modularity.
+
CODING STYLE & STANDARDS
------------------------
@@ -829,19 +831,16 @@
All public library functions and most private or application functions
should be appropriately documented using Doxygen/Javadoc style
-comments. Without getting into the advanced details, this minimally
-means that you need to add an additional asterisk to a comment that
-precedes your functions:
+comments. This minimally means that you need to add an additional
+asterisk to a comment that precedes your functions. Public functions
+must be exported and imported using per-library macros that precede
+public symbol declarations (e.g., BU_EXPORT int func();). Example:
/**
* Computes the answer to the meaning of life, the universe, and
* everything.
*/
-int
-the_answer(void)
-{
- return 42;
-}
+MYLIB_EXPORT int mylib_function();
TESTING & DEBUGGING
Index: brlcad/branches/bioh/include
===================================================================
--- brlcad/branches/bioh/include 2020-05-25 18:28:45 UTC (rev 75927)
+++ brlcad/branches/bioh/include 2020-05-25 18:29:31 UTC (rev 75928)
Property changes on: brlcad/branches/bioh/include
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg/include:62110-62113
/brlcad/branches/prep-cache/include:68236-68933
/brlcad/branches/tcltk86/include:68300-75257
-/brlcad/trunk/include:75728-75834
\ No newline at end of property
+/brlcad/trunk/include:75728-75834,75891-75926
\ No newline at end of property
Modified: brlcad/branches/bioh/misc/CMake/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/misc/CMake/CMakeLists.txt 2020-05-25 18:28:45 UTC
(rev 75927)
+++ brlcad/branches/bioh/misc/CMake/CMakeLists.txt 2020-05-25 18:29:31 UTC
(rev 75928)
@@ -22,8 +22,6 @@
FindAppleseed.cmake
FindBlosc.cmake
FindBSON.cmake
- FindFontconfig.cmake
- FindGDAL.cmake
FindGECODE.cmake
FindGL.cmake
FindIlmBase.cmake
Deleted: brlcad/branches/bioh/misc/CMake/FindFontconfig.cmake
===================================================================
--- brlcad/branches/bioh/misc/CMake/FindFontconfig.cmake 2020-05-25
18:28:45 UTC (rev 75927)
+++ brlcad/branches/bioh/misc/CMake/FindFontconfig.cmake 2020-05-25
18:29:31 UTC (rev 75928)
@@ -1,101 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindFontconfig
---------------
-
-Find Fontconfig headers and library.
-
-Imported Targets
-^^^^^^^^^^^^^^^^
-
-``Fontconfig::Fontconfig``
- The Fontconfig library, if found.
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This will define the following variables in your project:
-
-``Fontconfig_FOUND``
- true if (the requested version of) Fontconfig is available.
-``Fontconfig_VERSION``
- the version of Fontconfig.
-``Fontconfig_LIBRARIES``
- the libraries to link against to use Fontconfig.
-``Fontconfig_INCLUDE_DIRS``
- where to find the Fontconfig headers.
-``Fontconfig_COMPILE_OPTIONS``
- this should be passed to target_compile_options(), if the
- target is not used for linking
-
-#]=======================================================================]
-
-
-# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-find_package(PkgConfig QUIET)
-pkg_check_modules(PKG_FONTCONFIG QUIET fontconfig)
-set(Fontconfig_COMPILE_OPTIONS ${PKG_FONTCONFIG_CFLAGS_OTHER})
-set(Fontconfig_VERSION ${PKG_FONTCONFIG_VERSION})
-
-find_path( Fontconfig_INCLUDE_DIR
- NAMES
- fontconfig/fontconfig.h
- HINTS
- ${PKG_FONTCONFIG_INCLUDE_DIRS}
- /usr/X11/include
-)
-
-find_library( Fontconfig_LIBRARY
- NAMES
- fontconfig
- PATHS
- ${PKG_FONTCONFIG_LIBRARY_DIRS}
-)
-
-if (Fontconfig_INCLUDE_DIR AND NOT Fontconfig_VERSION)
- file(STRINGS ${Fontconfig_INCLUDE_DIR}/fontconfig/fontconfig.h _contents
REGEX "^#define[ \t]+FC_[A-Z]+[ \t]+[0-9]+$")
- unset(Fontconfig_VERSION)
- foreach(VPART MAJOR MINOR REVISION)
- foreach(VLINE ${_contents})
- if(VLINE MATCHES "^#define[\t ]+FC_${VPART}[\t ]+([0-9]+)$")
- set(Fontconfig_VERSION_PART "${CMAKE_MATCH_1}")
- if(Fontconfig_VERSION)
- string(APPEND Fontconfig_VERSION ".${Fontconfig_VERSION_PART}")
- else()
- set(Fontconfig_VERSION "${Fontconfig_VERSION_PART}")
- endif()
- endif()
- endforeach()
- endforeach()
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Fontconfig
- FOUND_VAR
- Fontconfig_FOUND
- REQUIRED_VARS
- Fontconfig_LIBRARY
- Fontconfig_INCLUDE_DIR
- VERSION_VAR
- Fontconfig_VERSION
-)
-
-
-if(Fontconfig_FOUND AND NOT TARGET Fontconfig::Fontconfig)
- add_library(Fontconfig::Fontconfig UNKNOWN IMPORTED)
- set_target_properties(Fontconfig::Fontconfig PROPERTIES
- IMPORTED_LOCATION "${Fontconfig_LIBRARY}"
- INTERFACE_COMPILE_OPTIONS "${Fontconfig_COMPILE_OPTIONS}"
- INTERFACE_INCLUDE_DIRECTORIES "${Fontconfig_INCLUDE_DIR}"
- )
-endif()
-
-mark_as_advanced(Fontconfig_LIBRARY Fontconfig_INCLUDE_DIR)
-
-if(Fontconfig_FOUND)
- set(Fontconfig_LIBRARIES ${Fontconfig_LIBRARY})
- set(Fontconfig_INCLUDE_DIRS ${Fontconfig_INCLUDE_DIR})
-endif()
Deleted: brlcad/branches/bioh/misc/CMake/FindGDAL.cmake
===================================================================
--- brlcad/branches/bioh/misc/CMake/FindGDAL.cmake 2020-05-25 18:28:45 UTC
(rev 75927)
+++ brlcad/branches/bioh/misc/CMake/FindGDAL.cmake 2020-05-25 18:29:31 UTC
(rev 75928)
@@ -1,193 +0,0 @@
-# Copyright 2000-2020 Kitware, Inc. and Contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * 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.
-#
-# * Neither the name of Kitware, Inc. nor the names of Contributors
-# may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "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 COPYRIGHT
-# HOLDER OR CONTRIBUTORS 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.
-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindGDAL
---------
-
-Find Geospatial Data Abstraction Library (GDAL).
-
-IMPORTED Targets
-^^^^^^^^^^^^^^^^
-
-This module defines :prop_tgt:`IMPORTED` target ``GDAL::GDAL``
-if GDAL has been found.
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module will set the following variables in your project:
-
-``GDAL_FOUND``
- True if GDAL is found.
-``GDAL_INCLUDE_DIRS``
- Include directories for GDAL headers.
-``GDAL_LIBRARIES``
- Libraries to link to GDAL.
-``GDAL_VERSION``
- The version of GDAL found.
-
-Cache variables
-^^^^^^^^^^^^^^^
-
-The following cache variables may also be set:
-
-``GDAL_LIBRARY``
- The libgdal library file.
-``GDAL_INCLUDE_DIR``
- The directory containing ``gdal.h``.
-
-Hints
-^^^^^
-
-Set ``GDAL_DIR`` or ``GDAL_ROOT`` in the environment to specify the
-GDAL installation prefix.
-#]=======================================================================]
-
-# $GDALDIR is an environment variable that would
-# correspond to the ./configure --prefix=$GDAL_DIR
-# used in building gdal.
-#
-# Created by Eric Wing. I'm not a gdal user, but OpenSceneGraph uses it
-# for osgTerrain so I whipped this module together for completeness.
-# I actually don't know the conventions or where files are typically
-# placed in distros.
-# Any real gdal users are encouraged to correct this (but please don't
-# break the OS X framework stuff when doing so which is what usually seems
-# to happen).
-
-# This makes the presumption that you are include gdal.h like
-#
-#include "gdal.h"
-
-find_path(GDAL_INCLUDE_DIR gdal.h
- HINTS
- ENV GDAL_DIR
- ENV GDAL_ROOT
- PATH_SUFFIXES
- include/gdal
- include/GDAL
- include
-)
-
-if(UNIX)
- # Use gdal-config to obtain the library version (this should hopefully
- # allow us to -lgdal1.x.y where x.y are correct version)
- # For some reason, libgdal development packages do not contain
- # libgdal.so...
- find_program(GDAL_CONFIG gdal-config
- HINTS
- ENV GDAL_DIR
- ENV GDAL_ROOT
- PATH_SUFFIXES bin
- )
-
- if(GDAL_CONFIG)
- exec_program(${GDAL_CONFIG} ARGS --libs OUTPUT_VARIABLE
GDAL_CONFIG_LIBS)
-
- if(GDAL_CONFIG_LIBS)
- # treat the output as a command line and split it up
- separate_arguments(args NATIVE_COMMAND "${GDAL_CONFIG_LIBS}")
-
- # only consider libraries whose name matches this pattern
- set(name_pattern "[gG][dD][aA][lL]")
-
- # consider each entry as a possible library path, name, or parent
directory
- foreach(arg IN LISTS args)
- # library name
- if("${arg}" MATCHES "^-l(.*)$")
- set(lib "${CMAKE_MATCH_1}")
-
- # only consider libraries whose name matches the expected
pattern
- if("${lib}" MATCHES "${name_pattern}")
- list(APPEND _gdal_lib "${lib}")
- endif()
- # library search path
- elseif("${arg}" MATCHES "^-L(.*)$")
- list(APPEND _gdal_libpath "${CMAKE_MATCH_1}")
- # assume this is a full path to a library
- elseif(IS_ABSOLUTE "${arg}" AND EXISTS "${arg}")
- # extract the file name
- get_filename_component(lib "${arg}" NAME)
-
- # only consider libraries whose name matches the expected
pattern
- if(NOT "${lib}" MATCHES "${name_pattern}")
- continue()
- endif()
-
- # extract the file directory
- get_filename_component(dir "${arg}" DIRECTORY)
-
- # remove library prefixes/suffixes
- string(REGEX REPLACE
"^(${CMAKE_SHARED_LIBRARY_PREFIX}|${CMAKE_STATIC_LIBRARY_PREFIX})" "" lib
"${lib}")
- string(REGEX REPLACE
"(${CMAKE_SHARED_LIBRARY_SUFFIX}|${CMAKE_STATIC_LIBRARY_SUFFIX})$" "" lib
"${lib}")
-
- # use the file name and directory as hints
- list(APPEND _gdal_libpath "${dir}")
- list(APPEND _gdal_lib "${lib}")
- endif()
- endforeach()
- endif()
- endif()
-endif()
-
-find_library(GDAL_LIBRARY
- NAMES ${_gdal_lib} gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
- HINTS
- ENV GDAL_DIR
- ENV GDAL_ROOT
- ${_gdal_libpath}
- PATH_SUFFIXES lib
-)
-
-if (EXISTS "${GDAL_INCLUDE_DIR}/gdal_version.h")
- file(STRINGS "${GDAL_INCLUDE_DIR}/gdal_version.h" _gdal_version
- REGEX "GDAL_RELEASE_NAME")
- string(REGEX REPLACE ".*\"\(.*\)\"" "\\1" GDAL_VERSION "${_gdal_version}")
- unset(_gdal_version)
-else ()
- set(GDAL_VERSION GDAL_VERSION-NOTFOUND)
-endif ()
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GDAL
- VERSION_VAR GDAL_VERSION
- REQUIRED_VARS GDAL_LIBRARY GDAL_INCLUDE_DIR)
-
-if (GDAL_FOUND AND NOT TARGET GDAL::GDAL)
- add_library(GDAL::GDAL UNKNOWN IMPORTED)
- set_target_properties(GDAL::GDAL PROPERTIES
- IMPORTED_LOCATION "${GDAL_LIBRARY}"
- INTERFACE_INCLUDE_DIRECTORIES "${GDAL_INCLUDE_DIR}")
-endif ()
-
-set(GDAL_LIBRARIES ${GDAL_LIBRARY})
-set(GDAL_INCLUDE_DIRS ${GDAL_INCLUDE_DIR})
Modified: brlcad/branches/bioh/misc/CMake/FindTCL.cmake
===================================================================
--- brlcad/branches/bioh/misc/CMake/FindTCL.cmake 2020-05-25 18:28:45 UTC
(rev 75927)
+++ brlcad/branches/bioh/misc/CMake/FindTCL.cmake 2020-05-25 18:29:31 UTC
(rev 75928)
@@ -275,6 +275,49 @@
PATH_SUFFIXES ${TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES}
)
+# IFF we have TCL_TK_SYSTEM_GRAPHICS set and have a system TK_WISH, check that
the
+# windowing system matches the specified type
+if (NOT "${TCL_TK_SYSTEM_GRAPHICS}" STREQUAL "" AND TK_WISH AND NOT TARGET
"${TK_WISH}")
+ set(tkwin_script "
+ set filename \"${CMAKE_BINARY_DIR}/CMakeTmp/TK_WINDOWINGSYSTEM\"
+ set fileId [open $filename \"w\"]
+ set windowingsystem [tk windowingsystem]
+ puts $fileId $windowingsystem
+ close $fileId
+ exit
+ ")
+ set(tkwin_scriptfile
"${CMAKE_BINARY_DIR}/CMakeTmp/tk_windowingsystem.tcl")
+ set(WSYS "wm-NOTFOUND")
+ file(WRITE ${tkwin_scriptfile} ${tkwin_script})
+ execute_process(COMMAND ${TK_WISH} ${tkwin_scriptfile} OUTPUT_VARIABLE
EXECOUTPUT)
+ if (EXISTS "${CMAKE_BINARY_DIR}/CMakeTmp/TK_WINDOWINGSYSTEM")
+ file(READ "${CMAKE_BINARY_DIR}/CMakeTmp/TK_WINDOWINGSYSTEM"
readresultvar)
+ string(REGEX REPLACE "\n" "" WSYS "${readresultvar}")
+ endif (EXISTS "${CMAKE_BINARY_DIR}/CMakeTmp/TK_WINDOWINGSYSTEM")
+
+ # If we have no information about the windowing system or it does not
match
+ # a specified system, the find_package detection has failed
+ if (NOT "${WSYS}" STREQUAL "${TCL_TK_SYSTEM_GRAPHICS}")
+ unset(TCL_LIBRARY CACHE)
+ unset(TCL_STUB_LIBRARY CACHE)
+ unset(TK_LIBRARY CACHE)
+ unset(TK_STUB_LIBRARY CACHE)
+ unset(TCL_FOUND CACHE)
+ unset(TK_FOUND CACHE)
+ unset(TCLTK_FOUND CACHE)
+ unset(TCLSH_FOUND CACHE)
+ unset(TCL_LIBRARY CACHE)
+ unset(TCL_INCLUDE_PATH CACHE)
+ unset(TCL_TCLSH CACHE)
+ unset(TK_LIBRARY CACHE)
+ unset(TK_INCLUDE_PATH CACHE)
+ unset(TK_WISH CACHE)
+ unset(TCL_STUB_LIBRARY CACHE)
+ unset(TK_STUB_LIBRARY CACHE)
+ unset(TTK_STUB_LIBRARY CACHE)
+ endif (NOT "${WSYS}" STREQUAL "${TCL_TK_SYSTEM_GRAPHICS}")
+endif (NOT "${TCL_TK_SYSTEM_GRAPHICS}" STREQUAL "" AND TK_WISH AND NOT TARGET
"${TK_WISH}")
+
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL
Index: brlcad/branches/bioh/regress
===================================================================
--- brlcad/branches/bioh/regress 2020-05-25 18:28:45 UTC (rev 75927)
+++ brlcad/branches/bioh/regress 2020-05-25 18:29:31 UTC (rev 75928)
Property changes on: brlcad/branches/bioh/regress
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg/regress:62110-62113
/brlcad/branches/prep-cache/regress:68236-68933
/brlcad/branches/tcltk86/regress:68300-75257
-/brlcad/trunk/regress:75728-75871
\ No newline at end of property
+/brlcad/trunk/regress:75728-75871,75891-75926
\ No newline at end of property
Index: brlcad/branches/bioh/src/libbu
===================================================================
--- brlcad/branches/bioh/src/libbu 2020-05-25 18:28:45 UTC (rev 75927)
+++ brlcad/branches/bioh/src/libbu 2020-05-25 18:29:31 UTC (rev 75928)
Property changes on: brlcad/branches/bioh/src/libbu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/brlcad/branches/RELEASE/src/libbu:70323-70333,71915-71935,72826-72858,74376-74454
/brlcad/branches/brep-debug/src/libbu:69168,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/tcltk86/src/libbu:68300-75257
-/brlcad/trunk/src/libbu:75720-75834,75879-75890
\ No newline at end of property
+/brlcad/trunk/src/libbu:75720-75834,75879-75926
\ No newline at end of property
Modified: brlcad/branches/bioh/src/libbu/realpath_bsd.c
===================================================================
--- brlcad/branches/bioh/src/libbu/realpath_bsd.c 2020-05-25 18:28:45 UTC
(rev 75927)
+++ brlcad/branches/bioh/src/libbu/realpath_bsd.c 2020-05-25 18:29:31 UTC
(rev 75928)
@@ -165,7 +165,11 @@
errno = ENAMETOOLONG;
goto err;
}
- slen = readlink(resolved, symlink, sizeof(symlink));
+ slen = readlink(resolved, symlink, sizeof(symlink) - 1);
+ /* POS30-C: ensure NULL termination of readlink */
+ if (slen >= 0) {
+ symlink[slen] = '\0';
+ }
if (slen < 0) {
switch (errno) {
case EINVAL:
Modified: brlcad/branches/bioh/src/libgcv/plugins/obj/obj_read.c
===================================================================
--- brlcad/branches/bioh/src/libgcv/plugins/obj/obj_read.c 2020-05-25
18:28:45 UTC (rev 75927)
+++ brlcad/branches/bioh/src/libgcv/plugins/obj/obj_read.c 2020-05-25
18:29:31 UTC (rev 75928)
@@ -1184,10 +1184,11 @@
tri_arr_2D_t index_arr_tri_2D = NULL;
tri_arr_3D_t index_arr_tri_3D = NULL;
- double *facePoints;
- int *triFaces;
- size_t i, numFacePoints;
- struct faceuse *fu;
+ double *facePoints = NULL;
+ int *triFaces = NULL;
+ size_t i = 0;
+ size_t numFacePoints = 0;
+ struct faceuse *fu = NULL;
const int POINTS_PER_FACE = 3;
if (ti->index_arr_tri == (void *)NULL) {
Modified: brlcad/branches/bioh/src/libged/bot/extrude.cpp
===================================================================
--- brlcad/branches/bioh/src/libged/bot/extrude.cpp 2020-05-25 18:28:45 UTC
(rev 75927)
+++ brlcad/branches/bioh/src/libged/bot/extrude.cpp 2020-05-25 18:29:31 UTC
(rev 75928)
@@ -152,7 +152,7 @@
point_t pnts[6];
point_t pf[3];
vect_t pv1[3], pv2[3];
- vect_t n;
+ vect_t n = VINIT_ZERO;
bot_face_normal(&n, bot, i);
for (int j = 0; j < 3; j++) {
Modified: brlcad/branches/bioh/src/librt/primitives/sketch/sketch.c
===================================================================
--- brlcad/branches/bioh/src/librt/primitives/sketch/sketch.c 2020-05-25
18:28:45 UTC (rev 75927)
+++ brlcad/branches/bioh/src/librt/primitives/sketch/sketch.c 2020-05-25
18:29:31 UTC (rev 75928)
@@ -2637,7 +2637,12 @@
{
int i, j, k;
int count;
- int start1, end1, start2, end2, start3, end3;
+ int start1 = 0;
+ int start2 = 0;
+ int start3 = 0;
+ int end1 = 0;
+ int end2 = 0;
+ int end3 = 0;
count = crv->count;
if (count < 2) {
Index: brlcad/branches/bioh/src/other
===================================================================
--- brlcad/branches/bioh/src/other 2020-05-25 18:28:45 UTC (rev 75927)
+++ brlcad/branches/bioh/src/other 2020-05-25 18:29:31 UTC (rev 75928)
Property changes on: brlcad/branches/bioh/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,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:75720-75834
\ No newline at end of property
+/brlcad/trunk/src/other:75720-75834,75891-75926
\ No newline at end of property
Modified: brlcad/branches/bioh/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/src/other/CMakeLists.txt 2020-05-25 18:28:45 UTC
(rev 75927)
+++ brlcad/branches/bioh/src/other/CMakeLists.txt 2020-05-25 18:29:31 UTC
(rev 75928)
@@ -308,13 +308,40 @@
# Tcl/Tk and related extensions
####################################################################
+function(TCL_RESET_VARS)
+ unset(TCL_LIBRARY CACHE)
+ unset(TCL_STUB_LIBRARY CACHE)
+ unset(TCL_FOUND CACHE)
+ unset(TCLSH_FOUND CACHE)
+ unset(TCL_LIBRARY CACHE)
+ unset(TCL_INCLUDE_PATH CACHE)
+ unset(TCL_TCLSH CACHE)
+ unset(TCL_STUB_LIBRARY CACHE)
+endfunction(TCL_RESET_VARS)
+
+function(TK_RESET_VARS)
+ unset(TK_LIBRARY CACHE)
+ unset(TK_STUB_LIBRARY CACHE)
+ unset(TK_FOUND CACHE)
+ unset(TCLTK_FOUND CACHE)
+ unset(TK_LIBRARY CACHE)
+ unset(TK_INCLUDE_PATH CACHE)
+ unset(TK_WISH CACHE)
+ unset(TK_STUB_LIBRARY CACHE)
+ unset(TTK_STUB_LIBRARY CACHE)
+endfunction(TK_RESET_VARS)
+
+
+# Set the expected graphics system (if known) before any find_package
+# calls related to Tcl
+if(BRLCAD_ENABLE_AQUA)
+ set(TK_ENABLE_AQUA ON CACHE STRING "BRL-CAD setting to enable AQUA" FORCE)
+ set(TCL_TK_SYSTEM_GRAPHICS "aqua" CACHE STRING "Tk system graphics type"
FORCE)
+endif(BRLCAD_ENABLE_AQUA)
+
# Make sure we actually look for these each time...
-unset(TCL_TCLSH CACHE)
-unset(TCL_LIBRARY CACHE)
-unset(TCL_INCLUDE_PATH CACHE)
-unset(TK_WISH CACHE)
-unset(TK_LIBRARY CACHE)
-unset(TK_INCLUDE_PATH CACHE)
+TCL_RESET_VARS()
+TK_RESET_VARS()
set(tcl_DESCRIPTION "
Option for enabling and disabling compilation of the Tcl library
@@ -375,7 +402,7 @@
")
set(inittcl_scriptfile "${CMAKE_BINARY_DIR}/CMakeTmp/tcl_inittcl.tcl")
file(WRITE ${inittcl_scriptfile} ${inittcl_script})
- exec_program(${TCL_TCLSH} ARGS ${inittcl_scriptfile} OUTPUT_VARIABLE
EXECOUTPUT)
+ execute_process(COMMAND ${TCL_TCLSH} ${inittcl_scriptfile} OUTPUT_VARIABLE
EXECOUTPUT)
file(READ "${CMAKE_BINARY_DIR}/CMakeTmp/tcl_inittcl" tcl_inittcl_raw)
string(REGEX REPLACE "\n" "" tcl_inittcl_paths_1 ${tcl_inittcl_raw})
string(REGEX REPLACE " " ";" tcl_inittcl_paths ${tcl_inittcl_paths_1})
@@ -411,9 +438,6 @@
local copy is built even if a system version is present. This option
also depends on BRLCAD_ENABLE_TK being ON.
")
-if(BRLCAD_ENABLE_AQUA)
- set(TK_ENABLE_AQUA ON CACHE STRING "BRL-CAD setting to enable AQUA" FORCE)
-endif(BRLCAD_ENABLE_AQUA)
THIRD_PARTY_TCL_PACKAGE(Tk tk "${TCL_TCLSH}" "tcl"
"BRLCAD_ENABLE_TK;BRLCAD_LEVEL2" "tk" tk_ALIASES tk_DESCRIPTION)
@@ -456,15 +480,13 @@
set(HAVE_TK_H 1)
# Packages probably still need to know the system graphics package
- if (NOT WIN32)
- if (APPLE AND TK_ENABLE_AQUA)
- set(TK_SYSTEM_GRAPHICS aqua)
- else ()
- set(TK_SYSTEM_GRAPHICS x11)
- endif (APPLE AND TK_ENABLE_AQUA)
- else (NOT WIN32)
+ if (BRLCAD_ENABLE_AQUA)
+ set(TK_SYSTEM_GRAPHICS aqua)
+ elseif (BRLCAD_ENABLE_X11)
+ set(TK_SYSTEM_GRAPHICS x11)
+ elseif (WIN32)
set(TK_SYSTEM_GRAPHICS win32)
- endif (NOT WIN32)
+ endif ()
set(TK_SYSTEM_GRAPHICS "${TK_SYSTEM_GRAPHICS}" CACHE STRING "Tk system
graphics type" FORCE)
else(BRLCAD_TK_BUILD)
@@ -472,11 +494,8 @@
# If we're not using Tk, make sure the variables are empty - CMake won't be
# happy if they're set to NOTFOUND and used, and FindTCL.cmake may have set
# them.
- set(TK_LIBRARY "" CACHE STRING "TK_LIBRARY" FORCE)
- set(TK_STUB_LIBRARY "" CACHE STRING "TK_LIBRARY" FORCE)
- set(TK_WISH "" CACHE STRING "TK_WISH" FORCE)
- set(TK_INCLUDE_PATH "" CACHE STRING "Tk include path" FORCE)
- set(TK_SYSTEM_GRAPHICS "" CACHE STRING "Tk system graphics type" FORCE)
+ TK_RESET_VARS()
+ unset(TK_SYSTEM_GRAPHICS CACHE)
endif(BRLCAD_TK_BUILD)
mark_as_advanced(TK_INCLUDE_PATH)
Index: brlcad/branches/bioh/src/other/stepcode
===================================================================
--- brlcad/branches/bioh/src/other/stepcode 2020-05-25 18:28:45 UTC (rev
75927)
+++ brlcad/branches/bioh/src/other/stepcode 2020-05-25 18:29:31 UTC (rev
75928)
Property changes on: brlcad/branches/bioh/src/other/stepcode
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/prep-cache/src/other/stepcode:68236-68933
/brlcad/branches/tcltk86/src/other/stepcode:68300-75257
/brlcad/branches/thirdparty_rework/src/other/stepcode:75098-75163
-/brlcad/trunk/src/other/stepcode:75728-75834
\ No newline at end of property
+/brlcad/trunk/src/other/stepcode:75728-75834,75891-75926
\ No newline at end of property
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
