merging RELEASE branch to STABLE branch, r72838 through r74436

svn:revision:74437
svn:branch:STABLE
svn:account:starseeker

AUTHORS

@@ -888,6 +888,16 @@ nicknames sharannyn
 2018 April
 Open Source (GSoC)
 
+Shinde, Chetan
+nicknames chetanshinde911
+2019 April
+Open Source (GSoC)
+
+Haydar, Ali
+nicknames lois221
+2019 May
+Open Source (GSoC)
+
 
 SPECIAL THANKS
 --------------

BUGS

@@ -15,6 +15,24 @@ on-going issues.
 Recent Bugs
 -----------
 
+* fix checker.sh script and/or overlap GUI so that the latter will
+  read the resulting overlap pairings file from the prior.
+  alternatively, need to be able to run overlap check on server
+  without GUI, so could implement an overlaps file output option to be
+  run via mged -c.
+
+* running 'put' on geometry that is already displayed results in a NaN
+  view (at least View and Eye_pos parameters are non) despite geometry
+  setill being displayed.  this causes 'rt' to fly into an infinite
+  loop, presumably trying to increment rays from the eye position.
+
+* icv dpix support is not cross-platform (it writes out native, reads
+  in assuming same encoding).  regression tests fail on big endian.
+
+* creating an object with a slashes in the name (e.g., cp foo foo/R)
+  results in an object that cannot be deleted/renamed.  bad behavior
+  presumably extends to any name with path separators.
+
 * mirror command rejects brep solids and turns faces inside-out when
   mirroring a comb with brep solids below it.
 
@@ -112,10 +130,6 @@ Recent Bugs
   private memory -- looks like private memory is not initialized
   (observed on Mac 10.6, Windows, and Ubuntu Linux using 7.26).
 
-* rtedge's overlay mode appears to be generating different results on
-  Windows and Linux for the m35 steering wheel (rtwizard rendering
-  mode D.)
-
 * pixdiff on Windows is reporting no differences with a pair of files
   that pixcmp can see differences in.
 

CHANGES

@@ -137,6 +137,20 @@ btclsh, bwish
 	Emacs key binding emulation
 	achieved by running btclsh in Emacs [deprecated 7.30]
 
+include/bu/redblach.h
+	All redblack related functions, structures and macros
+	defined in libbu's redblack.h.  Functions are:
+	bu_rb_create, bu_rb_delete, bu_rb_diagnose_tree,
+	bu_rb_summarize_tree, bu_rb_extreme, bu_rb_neighbor,
+	bu_rb_curr, bu_rb_free, bu_rb_insert, bu_rb_is_uniq,
+	bu_rb_set_uniqv, bu_rb_uniq_all_off, bu_rb_uniq_all_on,
+	bu_rb_uniq_on, bu_rb_uniq_off, bu_rb_rank, bu_rb_select,
+	bu_rb_search, bu_rb_walk
+	Use C++ containers set/map from std [deprecated 7.30]
+
+nirt
+	Behavior available under the --old flag [deprecated 7.30]
+
 7.28
 ----
 include/bu/malloc.h
@@ -677,6 +691,8 @@ may work:
 
 find . -type f -not -path "*.svn/*" -regex '.*\(c\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e 'EXPRESSION' {} \;
 
+find src \( -name '*.c' -or -name '*.cxx' -or -name '*.cpp' -or -name '*.h' -or -name '*.hxx' -or -name '*.hpp' -or -name '*.java' -or -name '*.f' -or -name '*.sh' -or -name '*.tcl' -or -name '*.tk' -or -name '*.itcl' -or -name '*.itk' -or -name '*.pl' -or -name '*.php' -or -name '*.inc' -or -name '*.mged' -or -name '*.y' -or -name '*.l' -or -name '*.yy' \) -not \( -name other -or -regex '.*/other/.*' -or -name tools -or -regex '.*/misc/tools/.*' -or -regex '.*/\.[^\.].*' -or -regex '.*~' -or -regex '.*/#.*' \)
+
 Expressions are minimally tested, use with caution.  Make a backup.
 
 
@@ -1396,3 +1412,116 @@ s/struct[[:space:]]*ged_run_rt/struct ged_subprocess/g
 ----
 s/BU_DEBUG_MEM_LOG/0/g
 	bu memory debugging API removed [7.29]
+s/ged_count_tops/ged_who_argc/g
+s/ged_build_tops/ged_who_argv/g
+        functions renamed as they pertain to 'who' listings, not 'tops' [7.30]
+s/rt_tess_tol/bg_tess_tol/g
+s/RT_TESS_TOL_MAGIC/BG_TESS_TOL_MAGIC/g
+s/RT_TESS_TOL_INIT_ZERO/BG_TESS_TOL_INIT_ZERO/g
+s/RT_CK_TESS_TOL/BG_CK_TESS_TOL/g
+        moved librt tolerances to libbg [7.30]
+s/DEBUG_PT_FU/DEBUG_PNT_FU/g
+s/DIST_PT2_PT2/DIST_PNT2_PNT2/g
+s/DIST_PT2_PT2_SQ/DIST_PNT2_PNT2_SQ/g
+s/DIST_PT_PLANE/DIST_PNT_PLANE/g
+s/DIST_PT_PT/DIST_PNT_PNT/g
+s/DIST_PT_PT_SQ/DIST_PNT_PNT_SQ/g
+s/V3PT_IN_RPP/V3PNT_IN_RPP/g
+s/V3PT_IN_RPP_TOL/V3PNT_IN_RPP_TOL/g
+s/V3PT_OUT_RPP_TOL/V3PNT_OUT_RPP_TOL/g
+s/WDB_METABALLPT_NULL/WDB_METABALL_PNT_NULL/g
+s/_ged_cm_lookat_pt/_ged_cm_lookat_pnt/g
+s/_ged_get_metaball_i_pt/_ged_get_metaball_i_pnt/g
+s/add_metaballpt/metaball_add_pnt/g
+s/add_pipept/pipe_add_pnt/g
+s/append_pipept/pipe_append_pnt/g
+s/bg_3d_polygon_mk_pts_planes/bg_3d_polygon_make_pnts_planes/g
+s/bg_pt_in_polygon/bg_pnt_in_polygon/g
+s/bn_3pts_collinear/bn_3pnts_collinear/g
+s/bn_3pts_distinct/bn_3pnts_distinct/g
+s/bn_dist_line3_pt3/bn_dist_line3_pnt3/g
+s/bn_dist_pt2_along_line2/bn_dist_pnt2_along_line2/g
+s/bn_dist_pt2_lseg2/bn_dist_pnt2_lseg2/g
+s/bn_dist_pt3_along_line3/bn_dist_pnt3_along_line3/g
+s/bn_dist_pt3_line3/bn_dist_pnt3_line3/g
+s/bn_dist_pt3_lseg3/bn_dist_pnt3_lseg3/g
+s/bn_dist_pt3_pt3/bn_dist_pnt3_pnt3/g
+s/bn_dist_pt_lseg/bn_dist_pnt_lseg/g
+s/bn_distsq_line3_pt3/bn_distsq_line3_pnt3/g
+s/bn_distsq_pt3_lseg3_v2/bn_distsq_pnt3_lseg3_v2/g
+s/bn_isect_pt2_lseg2/bn_isect_pnt2_lseg2/g
+s/bn_isect_pt_lseg/bn_isect_pnt_lseg/g
+s/bn_mat_scale_about_pt/bn_mat_scale_about_pnt/g
+s/bn_mat_xform_about_pt/bn_mat_xform_about_pnt/g
+s/bn_mk_plane_3pts/bn_make_plane_3pnts/g
+s/bn_mkpoint_3planes/bn_make_pnt_3planes/g
+s/bn_npts_distinct/bn_npnts_distinct/g
+s/bn_pt2_pt2_equal/bn_pnt2_pnt2_equal/g
+s/bn_pt3_pt3_equal/bn_pnt3_pnt3_equal/g
+s/bn_sph_pts/bn_sph_pnts/g
+s/bn_table_delete_sample_pts/bn_table_delete_sample_pnts/g
+s/del_pipept/pipe_del_pnt/g
+s/delete_metaballpt/metaball_delete_pnt/g
+s/delete_pipept/pipe_pnt_delete/g
+s/exported_pipept/exported_pipe_pnt/g
+s/find_arb_edge_nearest_pt/find_arb_edge_nearest_pnt/g
+s/find_botpt_nearest_pt/find_bot_pnt_nearest_pnt/g
+s/find_metaballpt_nearest_pt/find_metaball_pnt_nearest_pnt/g
+s/find_nearest_ars_pt/find_ars_nearest_pnt/g
+s/find_pipept_nearest_pt/find_pipe_pnt_nearest_pnt/g
+s/ged_add_metaballpt/ged_metaball_add_pnt/g
+s/ged_append_pipept/ged_pipe_append_pnt/g
+s/ged_delete_metaballpt/ged_metaball_delete_pnt/g
+s/ged_delete_pipept/ged_pipe_pnt_delete/g
+s/ged_find_arb_edge_nearest_pt/ged_find_arb_edge_nearest_pnt/g
+s/ged_find_botpt_nearest_pt/ged_find_bot_pnt_nearest_pnt/g
+s/ged_find_metaballpt_nearest_pt/ged_find_metaball_pnt_nearest_pnt/g
+s/ged_find_pipept_nearest_pt/ged_find_pipe_pnt_nearest_pnt/g
+s/ged_mat_scale_about_pt/ged_mat_scale_about_pnt/g
+s/ged_move_botpt/ged_bot_move_pnt/g
+s/ged_move_botpts/ged_bot_move_pnts/g
+s/ged_move_metaballpt/ged_metaball_move_pnt/g
+s/ged_move_pipept/ged_pipe_move_pnt/g
+s/ged_prepend_pipept/ged_pipe_prepend_pnt/g
+s/ins_pipept/pipe_ins_pnt/g
+s/jitter_start_pt/jitter_start_pnt/g
+s/kdtree_get_pt/kdtree_get_pnt/g
+s/mat_scale_about_pt/mat_scale_about_pnt/g
+s/metaballpt/metaball_pnt/g
+s/mk_add_pipe_pt/mk_add_pipe_pnt/g
+s/move_botpt/bot_move_pnt/g
+s/move_botpts/bot_move_pnts/g
+s/move_metaballpt/metaball_move_pnt/g
+s/move_pipept/pipe_move_pnt/g
+s/move_pipept/pipe_move_pnt/g
+s/nmg_class_pt_f/nmg_class_pnt_f/g
+s/nmg_class_pt_fu_except/nmg_class_pnt_fu_except/g
+s/nmg_class_pt_l/nmg_class_pnt_l/g
+s/nmg_class_pt_lu_except/nmg_class_pnt_lu_except/g
+s/nmg_class_pt_s/nmg_class_pnt_s/g
+s/nmg_classify_pt_loop/nmg_classify_pnt_loop/g
+s/nmg_find_pt_in_face/nmg_find_pnt_in_face/g
+s/nmg_find_pt_in_lu/nmg_find_pnt_in_lu/g
+s/nmg_find_pt_in_model/nmg_find_pnt_in_model/g
+s/nmg_find_pt_in_shell/nmg_find_pnt_in_shell/g
+s/nmg_get_interior_pt/nmg_get_interior_pnt/g
+s/nmg_move_edge_thru_pt/nmg_move_edge_thru_pnt/g
+s/nmg_nurb_print_pt_type/nmg_nurb_print_pnt_type/g
+s/pipept/pipe_pnt/g
+s/prepend_pipept/pipe_prepend_pnt/g
+s/rt_arb_add_pt/rt_arb_add_pnt/g
+s/rt_ell_16pts/rt_ell_16pnts/g
+s/rt_metaballpt_print/rt_metaball_pnt_print/g
+s/rt_pipept_print/rt_pipe_pnt_print/g
+s/rt_pr_pt/rt_pr_partition/g
+s/rt_pr_pt_vls/rt_pr_partition_vls/g
+s/rt_pt_node/rt_pnt_node/g
+s/rt_pt_sort/rt_pnt_sort/g
+s/rt_vls_metaballpt/rt_metaball_pnt_vls/g
+s/rt_vls_pipept/rt_pipe_pnt_vls/g
+s/split_pipept/pipe_split_pnt/g
+s/tclcad_bn_dist_pt2_lseg2/tclcad_bn_dist_pnt2_lseg2/g
+s/tclcad_bn_mat_xform_about_pt/tclcad_bn_mat_xform_about_pnt/g
+s/wdb_metaballpt/wdb_metaball_pnt/g
+s/wdb_pipept/wdb_pipe_pnt/g
+        renamed points from pt to pnt for consistency [7.30]

CMakeLists.txt

@@ -948,6 +948,11 @@ if(DEFINED BRLCAD_VERSION_AMEND)
   CONFIG_H_APPEND(BRLCAD "#define BRLCAD_VERSION_AMEND ${BRLCAD_VERSION_AMEND}\n")
 endif(DEFINED BRLCAD_VERSION_AMEND)
 
+# bu_dir needs to know some platform-specific information about executable and library
+# suffixes - just use CMake's knowledge of this information
+CONFIG_H_APPEND(BRLCAD "#define EXE_SUFFIX \"${CMAKE_EXECUTABLE_SUFFIX}\"\n")
+CONFIG_H_APPEND(BRLCAD "#define SHARED_LIB_SUFFIX \"${CMAKE_SHARED_LIBRARY_SUFFIX}\"\n")
+
 #----------------------------------------------------------------------
 # If we're not debugging, we want HIDDEN to be defined as static.  Set
 # the NDEBUG flag accordingly, and common.h will take it from there.
@@ -1332,6 +1337,17 @@ if(BRLCAD_ENABLE_OPENCL)
   endif(NOT OPENCL_FOUND)
 endif(BRLCAD_ENABLE_OPENCL)
 
+# Enable features requiring OpenVDB
+option(BRLCAD_ENABLE_OPENVDB "Enable features requiring OpenVDB" OFF)
+mark_as_advanced(BRLCAD_ENABLE_OPENVDB)
+if(BRLCAD_ENABLE_OPENVDB)
+  find_package(OpenVDB)
+  if(NOT OpenVDB_FOUND)
+    message("OpenVDB enablement requested, but OpenVDB is not found - disabling")
+    set(BRLCAD_ENABLE_OPENVDB OFF)
+  endif(NOT OpenVDB_FOUND)
+endif(BRLCAD_ENABLE_OPENVDB)
+
 # Enable experimental support for binary attributes
 option(BRLCAD_ENABLE_BINARY_ATTRIBUTES "Enable support for binary attributes" OFF)
 mark_as_advanced(BRLCAD_ENABLE_BINARY_ATTRIBUTES)
@@ -1820,6 +1836,24 @@ if (ERROR_FLAG)
   set(CMAKE_REQUIRED_FLAGS "-Werror")
 endif (ERROR_FLAG)
 
+# Check whether the compiler supports __attribute__((format (__printf__, 1, 2)))
+check_c_source_compiles("int pf(const char *f, ...) __attribute__((format (__printf__, 1, 2))); int pf(const char *f, ...){return 1;} int main(int argc, char *argv[]) {return pf(\"%c\",'a');}" HAVE_PRINTF12_ATTRIBUTE)
+if(HAVE_PRINTF12_ATTRIBUTE)
+  CONFIG_H_APPEND(BRLCAD "#define HAVE_PRINTF12_ATTRIBUTE 1\n")
+endif(HAVE_PRINTF12_ATTRIBUTE)
+
+# Check whether the compiler supports __attribute__((format (__printf__, 2, 3)))
+check_c_source_compiles("int pf(void *o, const char *f, ...) __attribute__((format (__printf__, 2, 3))); int pf(void *o, const char *f, ...){return 1;} int main(int argc, char *argv[]) {return pf((void *)0, \"%c\",'a');}" HAVE_PRINTF23_ATTRIBUTE)
+if(HAVE_PRINTF23_ATTRIBUTE)
+  CONFIG_H_APPEND(BRLCAD "#define HAVE_PRINTF23_ATTRIBUTE 1\n")
+endif(HAVE_PRINTF23_ATTRIBUTE)
+
+# Check whether the compiler supports __attribute__((format (__scanf__, 2, 3)))
+check_c_source_compiles("int sf(void *o, const char *f, ...) __attribute__((format (__scanf__, 2, 3))); int sf(void *o, const char *f, ...){return 1;} int main(int argc, char *argv[]) {int i = 1; return sf((void *)0, \"%d\", &i);}" HAVE_SCANF23_ATTRIBUTE)
+if(HAVE_SCANF23_ATTRIBUTE)
+  CONFIG_H_APPEND(BRLCAD "#define HAVE_SCANF23_ATTRIBUTE 1\n")
+endif(HAVE_SCANF23_ATTRIBUTE)
+
 include(CheckCSourceCompiles)
 # Check whether the compiler supports __attribute__((__noreturn__))
 check_c_source_compiles("#include <stdlib.h>\n
@@ -1840,23 +1874,35 @@ if(HAVE_ALWAYS_INLINE_ATTRIBUTE)
   CONFIG_H_APPEND(BRLCAD "#define HAVE_ALWAYS_INLINE_ATTRIBUTE 1\n")
 endif(HAVE_ALWAYS_INLINE_ATTRIBUTE)
 
-# Check whether the compiler supports __attribute__((format (__printf__, 1, 2)))
-check_c_source_compiles("int pf(const char *f, ...) __attribute__((format (__printf__, 1, 2))); int pf(const char *f, ...){return 1;} int main(int argc, char *argv[]) {return pf(\"%c\",'a');}" HAVE_PRINTF12_ATTRIBUTE)
-if(HAVE_PRINTF12_ATTRIBUTE)
-  CONFIG_H_APPEND(BRLCAD "#define HAVE_PRINTF12_ATTRIBUTE 1\n")
-endif(HAVE_PRINTF12_ATTRIBUTE)
-
-# Check whether the compiler supports __attribute__((format (__printf__, 2, 3)))
-check_c_source_compiles("int pf(void *o, const char *f, ...) __attribute__((format (__printf__, 2, 3))); int pf(void *o, const char *f, ...){return 1;} int main(int argc, char *argv[]) {return pf((void *)0, \"%c\",'a');}" HAVE_PRINTF23_ATTRIBUTE)
-if(HAVE_PRINTF23_ATTRIBUTE)
-  CONFIG_H_APPEND(BRLCAD "#define HAVE_PRINTF23_ATTRIBUTE 1\n")
-endif(HAVE_PRINTF23_ATTRIBUTE)
-
-# Check whether the compiler supports __attribute__((format (__scanf__, 2, 3)))
-check_c_source_compiles("int sf(void *o, const char *f, ...) __attribute__((format (__scanf__, 2, 3))); int sf(void *o, const char *f, ...){return 1;} int main(int argc, char *argv[]) {int i = 1; return sf((void *)0, \"%d\", &i);}" HAVE_SCANF23_ATTRIBUTE)
-if(HAVE_SCANF23_ATTRIBUTE)
-  CONFIG_H_APPEND(BRLCAD "#define HAVE_SCANF23_ATTRIBUTE 1\n")
-endif(HAVE_SCANF23_ATTRIBUTE)
+# Check whether the compiler supports __attribute__((const))
+check_c_source_compiles("void func() __attribute__((const)); void func(){return;} int main(int argc, char *argv[]) {func(); return 0;}" HAVE_CONST_ATTRIBUTE)
+if(HAVE_CONST_ATTRIBUTE)
+  CONFIG_H_APPEND(BRLCAD "#define HAVE_CONST_ATTRIBUTE 1\n")
+endif(HAVE_CONST_ATTRIBUTE)
+
+# Check whether the compiler supports __attribute__((pure))
+check_c_source_compiles("void func() __attribute__((pure)); void func(){return;} int main(int argc, char *argv[]) {func(); return 0;}" HAVE_PURE_ATTRIBUTE)
+if(HAVE_PURE_ATTRIBUTE)
+  CONFIG_H_APPEND(BRLCAD "#define HAVE_PURE_ATTRIBUTE 1\n")
+endif(HAVE_PURE_ATTRIBUTE)
+
+# Check whether the compiler supports __attribute__((cold))
+check_c_source_compiles("void func() __attribute__((cold)); void func(){return;} int main(int argc, char *argv[]) {func(); return 0;}" HAVE_COLD_ATTRIBUTE)
+if(HAVE_COLD_ATTRIBUTE)
+  CONFIG_H_APPEND(BRLCAD "#define HAVE_COLD_ATTRIBUTE 1\n")
+endif(HAVE_COLD_ATTRIBUTE)
+
+# Check whether the compiler supports __attribute__((nonnull))
+check_c_source_compiles("int *func(int *) __attribute__((nonnull)); int *func(int *v){(*v)-=1; return v;} int main(int argc, char *argv[]) {int v = 1; int *vp = func(&v); return *vp;}" HAVE_NONNULL_ATTRIBUTE)
+if(HAVE_NONNULL_ATTRIBUTE)
+  CONFIG_H_APPEND(BRLCAD "#define HAVE_NONNULL_ATTRIBUTE 1\n")
+endif(HAVE_NONNULL_ATTRIBUTE)
+
+# Check whether the compiler supports __attribute__((warn_unused_result))
+check_c_source_compiles("int *func(int *) __attribute__((warn_unused_result)); int *func(int *v){(*v)-=1; return v;} int main(int argc, char *argv[]) {int v = 1; int *vp = func(&v); return *vp;}" HAVE_WARN_UNUSED_RESULT_ATTRIBUTE)
+if(HAVE_WARN_UNUSED_RESULT_ATTRIBUTE)
+  CONFIG_H_APPEND(BRLCAD "#define HAVE_WARN_UNUSED_RESULT_ATTRIBUTE 1\n")
+endif(HAVE_WARN_UNUSED_RESULT_ATTRIBUTE)
 
 
 # Silence check for unused arguments (used to silence clang warnings about
@@ -2311,6 +2357,9 @@ find_package(Threads)
 # some compilation situations
 find_package(STL)
 
+# Check for an MPI library
+find_package(MPI)
+
 # Check for the daemon function in -lbsd and/or -lc for adrt
 BRLCAD_CHECK_LIBRARY(BSD bsd daemon)
 BRLCAD_CHECK_LIBRARY(BSD c daemon)
@@ -2647,13 +2696,14 @@ if(BRLCAD_PRINT_MSGS)
   message("***********************************************************")
 endif(BRLCAD_PRINT_MSGS)
 
+include(CheckSymbolExists)
+
 BRLCAD_FUNCTION_EXISTS(XQueryExtension)
 BRLCAD_FUNCTION_EXISTS(_putenv_s)
 BRLCAD_FUNCTION_EXISTS(_splitpath)
 BRLCAD_FUNCTION_EXISTS(_strtoi64)
 BRLCAD_FUNCTION_EXISTS(alarm)
 BRLCAD_FUNCTION_EXISTS(asinh REQUIRED_LIBS ${M_LIBRARY})
-BRLCAD_FUNCTION_EXISTS(canonicalize_file_name)
 BRLCAD_FUNCTION_EXISTS(confstr) # darwin/mac
 BRLCAD_FUNCTION_EXISTS(dlopen)
 BRLCAD_FUNCTION_EXISTS(drand48)
@@ -2682,6 +2732,7 @@ BRLCAD_FUNCTION_EXISTS(isinf REQUIRED_LIBS ${M_LIBRARY})
 BRLCAD_FUNCTION_EXISTS(isnan REQUIRED_LIBS ${M_LIBRARY})
 BRLCAD_FUNCTION_EXISTS(logb REQUIRED_LIBS ${M_LIBRARY})
 BRLCAD_FUNCTION_EXISTS(lrand48)
+BRLCAD_FUNCTION_EXISTS(lseek)
 BRLCAD_FUNCTION_EXISTS(mkstemp)
 BRLCAD_FUNCTION_EXISTS(modff REQUIRED_LIBS ${M_LIBRARY})
 BRLCAD_FUNCTION_EXISTS(nextafter REQUIRED_LIBS ${M_LIBRARY})
@@ -2767,6 +2818,19 @@ if(NOT HAVE_SNPRINTF)
   endif(HAVE__SNPRINTF)
 endif(NOT HAVE_SNPRINTF)
 
+# So far I haven't been able to come up with a reliable self contained
+# test for this, but libbu's #2 realpath test triggers a stack smash
+# on some linux systems.  For the moment, fall back on OpenBSD's
+# userspace implementation, which does seem to work.  Once we can
+# get a self-contained reproduction of this failure, put it below
+# and we can use the system realpath again.
+if(HAVE_REALPATH)
+  #check_c_source_runs("#include<limits.h>\n#include <stdlib.h>\nint main() { char dir[512]; const char *d = \"/tmp/REALPATH_TEST_PATH\"; d = (const char *)realpath(d, dir); return 0; }" HAVE_WORKING_REALPATH)
+  #if(HAVE_WORKING_REALPATH)
+  #  CONFIG_H_APPEND(BRLCAD "#define HAVE_WORKING_REALPATH 1\n")
+  #endif(HAVE_WORKING_REALPATH)
+endif(HAVE_REALPATH)
+
 # GetFullPathName
 check_c_source_compiles("
 #include <windows.h>
@@ -3395,6 +3459,7 @@ if(NOT BRLCAD_IS_SUBBUILD)
     set(CPACK_NSIS_INSTALL_DIRECTORY "BRL-CAD ${BRLCAD_VERSION}")
     set(CPACK_SOURCE_DIR "${CMAKE_SOURCE_DIR}")
     set(CPACK_DATA_DIR "${DATA_DIR}")
+    set(CPACK_DOC_DIR "${DOC_DIR}")
     # There is a bug in NSI that does not handle full unix paths properly. Make
     # sure there is at least one set of four (4) backslashes.
     set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/misc/nsis\\\\brlcad.ico")
@@ -3443,6 +3508,9 @@ if(NOT BRLCAD_IS_SUBBUILD)
     CTestConfig.cmake
     )
   CMAKEFILES(${toplevel_ignore_files})
+  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitignore)
+    CMAKEFILES(.gitignore)
+  endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitignore)
 
   # Handle some toplevel distclean listings
   DISTCLEAN("${CMAKE_BINARY_DIR}/CMakeCache.txt")