Fix FTBFS in F45+

- switch from Coin2 to Coin4
- drop SIMVoleon dependency

.gitignore

@@ -1,2 +1,4 @@
 /vxl-1.17.0.tar.gz
 /vxl-1.17.0-clean.tar.gz
+/vxl-2.0.2-clean.tar.gz
+/vxl-3.5.0-clean.tar.gz

0001-Added-include-path-for-geotiff.patch

@@ -1,26 +0,0 @@
-From ac852c19102585381f1762251716e62ebc86c0f7 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:09:48 +0200
-Subject: [PATCH 01/23] Added include path for geotiff
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- config/cmake/Modules/NewCMake/FindGEOTIFF.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/config/cmake/Modules/NewCMake/FindGEOTIFF.cmake b/config/cmake/Modules/NewCMake/FindGEOTIFF.cmake
-index 9e5013f..624e331 100644
---- a/config/cmake/Modules/NewCMake/FindGEOTIFF.cmake
-+++ b/config/cmake/Modules/NewCMake/FindGEOTIFF.cmake
-@@ -8,6 +8,8 @@
- #  GEOTIFF_LIBRARY, where to find the GEOTIFF library.
- 
- FIND_PATH(GEOTIFF_INCLUDE_DIR geotiff.h
-+  /usr/local/include/libgeotiff
-+  /usr/include/libgeotiff
-   /usr/local/include
-   /usr/include
- )
--- 
-1.7.11.7
-

0002-Added-soname-info-for-core-libraries.patch

@@ -1,117 +0,0 @@
-From 620fd77b0773f8cc9b57ff96b90d770eb5055b5d Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:10:50 +0200
-Subject: [PATCH 02/23] Added soname info for core libraries
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- CMakeLists.txt               | 20 ++++++++++++++++++++
- core/testlib/CMakeLists.txt  |  1 +
- core/vnl/CMakeLists.txt      |  1 +
- core/vnl/algo/CMakeLists.txt |  1 +
- v3p/netlib/CMakeLists.txt    |  2 ++
- vcl/CMakeLists.txt           |  1 +
- 6 files changed, 26 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 217f93a..67b2ea4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,6 +12,26 @@ ENDIF( COMMAND CMAKE_POLICY )
- 
- PROJECT(vxl)
- 
-+SET(VXL_MAJOR_VERSION 1)
-+SET(VXL_MINOR_VERSION 13)
-+SET(VXL_BUILD_VERSION 0)
-+SET(VXL_VERSION
-+  "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}.${VXL_BUILD_VERSION}")
-+SET(VXL_API_VERSION
-+  "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}")
-+SET(VXL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES}
-+  VERSION "${VXL_VERSION}"
-+  SOVERSION "${VXL_API_VERSION}"
-+)
-+SET(NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(V3P_NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VCL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VNL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VNL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(TESTLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+
-+
-+
- SET( LIBRARY_OUTPUT_PATH ${vxl_BINARY_DIR}/lib CACHE PATH
-      "Output directory for the vxl libraries" )
- 
-diff --git a/core/testlib/CMakeLists.txt b/core/testlib/CMakeLists.txt
-index da85662..4d105e9 100644
---- a/core/testlib/CMakeLists.txt
-+++ b/core/testlib/CMakeLists.txt
-@@ -29,6 +29,7 @@ SET( testlib_sources
- )
- 
- ADD_LIBRARY( testlib ${testlib_sources} )
-+SET_TARGET_PROPERTIES(testlib PROPERTIES ${TESTLIB_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( testlib vcl )
- INSTALL_TARGETS( /lib testlib)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/testlib ${testlib_sources})
-diff --git a/core/vnl/CMakeLists.txt b/core/vnl/CMakeLists.txt
-index 490022a..053cdab 100644
---- a/core/vnl/CMakeLists.txt
-+++ b/core/vnl/CMakeLists.txt
-@@ -264,6 +264,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vnl ${vnl_sources})
-+SET_TARGET_PROPERTIES(vnl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vnl vcl )
- 
- INSTALL_TARGETS(/lib vnl)
-diff --git a/core/vnl/algo/CMakeLists.txt b/core/vnl/algo/CMakeLists.txt
-index cefe140..2f99996 100644
---- a/core/vnl/algo/CMakeLists.txt
-+++ b/core/vnl/algo/CMakeLists.txt
-@@ -102,6 +102,7 @@ IF(NETLIB_FOUND)
-   AUX_SOURCE_DIRECTORY(Templates vnl_algo_sources)
- 
-   ADD_LIBRARY( vnl_algo ${vnl_algo_sources})
-+  SET_TARGET_PROPERTIES(vnl_algo PROPERTIES ${VNL_ALGO_LIBRARY_PROPERTIES})
-   TARGET_LINK_LIBRARIES( vnl_algo ${NETLIB_LIBRARIES} vnl )
- 
-   INSTALL_TARGETS(/lib vnl_algo)
-diff --git a/v3p/netlib/CMakeLists.txt b/v3p/netlib/CMakeLists.txt
-index 9e78799..0ad28f6 100644
---- a/v3p/netlib/CMakeLists.txt
-+++ b/v3p/netlib/CMakeLists.txt
-@@ -8,6 +8,7 @@ SET(netlib_sources
-    )
- 
- ADD_LIBRARY( netlib ${netlib_sources} )
-+SET_TARGET_PROPERTIES(netlib PROPERTIES ${NETLIB_LIBRARY_PROPERTIES})
- INSTALL_TARGETS( /lib netlib )
- INSTALL_FILES( /include/vxl/v3p/netlib .h triangle )
- 
-@@ -462,6 +463,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
- 
- # Create a netlib library with mangled symbols.
- ADD_LIBRARY(v3p_netlib ${v3p_netlib_sources})
-+SET_TARGET_PROPERTIES(v3p_netlib PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
- INSTALL_TARGETS( /lib v3p_netlib )
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${v3p_netlib_sources})
- IF(UNIX)
-diff --git a/vcl/CMakeLists.txt b/vcl/CMakeLists.txt
-index 11f1887..7f1e9d9 100644
---- a/vcl/CMakeLists.txt
-+++ b/vcl/CMakeLists.txt
-@@ -360,6 +360,7 @@ SET( vcl_sources
- #AUX_SOURCE_DIRECTORY(Templates vcl_sources)
- 
- ADD_LIBRARY(vcl ${vcl_sources})
-+SET_TARGET_PROPERTIES(vcl PROPERTIES ${VCL_LIBRARY_PROPERTIES})
- 
- # CMake can automatically figure out the compiler characteristics on
- # Windows too.  No need to do manual config.
--- 
-1.7.11.7
-

0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch

@@ -0,0 +1,923 @@
+From 26d548e302e9fa1bcc2986ba91f12313ccb00829 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 15 Nov 2018 15:20:08 +0000
+Subject: [PATCH 02/18] v3.5.0 Use Fedora expat and expatpp
+
+---
+ CMakeLists.txt                                |  2 +
+ config/cmake/fedora-modules/FindEXPATPP.cmake | 37 +++++++++++++++++
+ contrib/brl/b3p/expat/CMakeLists.txt          |  3 +-
+ contrib/brl/b3p/expatpp/CMakeLists.txt        | 22 +---------
+ contrib/brl/bbas/bhdfs/pro/CMakeLists.txt     |  3 +-
+ contrib/brl/bbas/bkml/CMakeLists.txt          |  2 +-
+ contrib/brl/bbas/bocl/pro/CMakeLists.txt      |  3 +-
+ contrib/brl/bbas/bvgl/CMakeLists.txt          |  3 +-
+ contrib/brl/bbas/bvgl/bvgl_labelme_parser.h   |  2 +-
+ contrib/brl/bbas/bvgl/tests/CMakeLists.txt    |  3 +-
+ contrib/brl/bbas/bwm/CMakeLists.txt           |  3 +-
+ contrib/brl/bbas/bwm/io/CMakeLists.txt        |  3 +-
+ contrib/brl/bbas/bwm/pro/CMakeLists.txt       |  3 +-
+ contrib/brl/bbas/bwm/video/CMakeLists.txt     |  3 +-
+ contrib/brl/bbas/bwm/video/exe/CMakeLists.txt |  3 +-
+ contrib/brl/bbas/bxml/CMakeLists.txt          |  9 ++--
+ contrib/brl/bbas/volm/CMakeLists.txt          |  3 +-
+ contrib/brl/bbas/volm/volm_osm_parser.h       |  2 +-
+ contrib/brl/bmods/FindEXPAT.cmake             | 41 ++-----------------
+ contrib/brl/bpro/CMakeLists.txt               |  3 +-
+ contrib/brl/bpro/bprb/tests/CMakeLists.txt    |  6 ++-
+ contrib/brl/bseg/bbgm/pro/CMakeLists.txt      |  3 +-
+ contrib/brl/bseg/bbgm_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/betr_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/bmdl/pro/CMakeLists.txt      |  3 +-
+ contrib/brl/bseg/bmdl_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/boxm2/CMakeLists.txt         |  3 +-
+ .../bseg/boxm2/boxm2_bounding_box_parser.h    |  2 +-
+ contrib/brl/bseg/boxm2/boxm2_scene_parser.h   |  2 +-
+ contrib/brl/bseg/boxm2/pro/CMakeLists.txt     |  3 +-
+ .../boxm2_ingest_convex_mesh_process.cxx      |  4 +-
+ contrib/brl/bseg/boxm2/volm/CMakeLists.txt    |  3 +-
+ .../brl/bseg/boxm2/volm/pro/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/boxm2_batch/CMakeLists.txt   |  3 +-
+ .../brl/bseg/boxm2_multi/pro/CMakeLists.txt   |  3 +-
+ contrib/brl/bseg/brec_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/bstm/CMakeLists.txt          |  3 +-
+ contrib/brl/bseg/bstm/bstm_scene_parser.h     |  2 +-
+ contrib/brl/bseg/bstm_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/bstm_multi/CMakeLists.txt    |  3 +-
+ .../bseg/bstm_multi/space_time_scene_parser.h |  2 +-
+ contrib/brl/bseg/bvpl/functors/CMakeLists.txt |  3 +-
+ contrib/brl/bseg/bvpl/kernels/CMakeLists.txt  |  3 +-
+ .../brl/bseg/bvpl/kernels/pro/CMakeLists.txt  |  3 +-
+ contrib/brl/bseg/bvpl/pro/CMakeLists.txt      |  3 +-
+ contrib/brl/bseg/bvpl_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/bvxm/CMakeLists.txt          |  3 +-
+ contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt |  3 +-
+ .../brl/bseg/bvxm/bvxm_world_params_parser.h  |  2 +-
+ contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt |  3 +-
+ contrib/brl/bseg/bvxm/pro/CMakeLists.txt      |  3 +-
+ contrib/brl/bseg/bvxm_batch/CMakeLists.txt    |  2 +
+ contrib/brl/bseg/bvxm_bridge/CMakeLists.txt   |  3 +-
+ contrib/brl/bseg/vcon/CMakeLists.txt          |  3 +-
+ 54 files changed, 144 insertions(+), 109 deletions(-)
+ create mode 100644 config/cmake/fedora-modules/FindEXPATPP.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e5de354156..e52a8c0abb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -75,6 +75,8 @@ SET(VXL_API_VERSION "${VXL_VERSION_MAJOR}.${VXL_VERSION_MINOR}")
+ SET(VXL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES} VERSION "${VXL_VERSION}"
+     SOVERSION "${VXL_API_VERSION}")
+ 
++set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/cmake/fedora-modules")
++
+ include(CMakeDependentOption)
+ include(${CMAKE_CURRENT_SOURCE_DIR}/config/cmake/VXLInitializeBuildType.cmake)
+ 
+diff --git a/config/cmake/fedora-modules/FindEXPATPP.cmake b/config/cmake/fedora-modules/FindEXPATPP.cmake
+new file mode 100644
+index 0000000000..88a29681aa
+--- /dev/null
++++ b/config/cmake/fedora-modules/FindEXPATPP.cmake
+@@ -0,0 +1,37 @@
++# Adapted from https://github.com/jirihnidek/verse-ply-uploader/blob/master/build_files/cmake/modules/FindEXPATPP.cmake
++# This module tries to find EXPATPP library and include files
++#
++# EXPATPP_INCLUDE_DIR, where to find verse.h
++# EXPATPP_LIBRARY_DIR, where to find libverse.so
++# EXPATPP_LIBRARIES, the library to link against
++# EXPATPP_FOUND, IF false, do not try to use Verse
++#
++
++FIND_PATH ( EXPATPP_INCLUDE_DIR expatpp.h
++    /usr/include
++    /usr/include/expatpp
++    /usr/local/include
++    /usr/local/include/expatpp
++)
++
++FIND_LIBRARY ( EXPATPP_LIBRARIES
++    NAMES expatpp libexpatpp
++    PATHS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64
++)
++
++GET_FILENAME_COMPONENT( EXPATPP_LIBRARY_DIR ${EXPATPP_LIBRARIES} PATH )
++
++SET ( EXPATPP_FOUND "NO" )
++IF ( EXPATPP_INCLUDE_DIR )
++    IF ( EXPATPP_LIBRARIES )
++        SET ( EXPATPP_LIBRARY ${EXPATPP_LIBRARIES} )
++        SET ( EXPATPP_FOUND "YES" )
++    ENDIF ( EXPATPP_LIBRARIES )
++ENDIF ( EXPATPP_INCLUDE_DIR )
++
++MARK_AS_ADVANCED (
++    EXPATPP_LIBRARY_DIR
++    EXPATPP_INCLUDE_DIR
++    EXPATPP_LIBRARIES
++    EXPATPP_LIBRARY
++)
+diff --git a/contrib/brl/b3p/expat/CMakeLists.txt b/contrib/brl/b3p/expat/CMakeLists.txt
+index dad475e211..d64a8f3832 100644
+--- a/contrib/brl/b3p/expat/CMakeLists.txt
++++ b/contrib/brl/b3p/expat/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ project(expat C)
+ #include_regular_expression("^.*$")
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(NOT VXL_USING_NATIVE_EXPAT)
+ 
+   if(WIN32)
+diff --git a/contrib/brl/b3p/expatpp/CMakeLists.txt b/contrib/brl/b3p/expatpp/CMakeLists.txt
+index 4959c123c3..f25323d0de 100644
+--- a/contrib/brl/b3p/expatpp/CMakeLists.txt
++++ b/contrib/brl/b3p/expatpp/CMakeLists.txt
+@@ -1,22 +1,4 @@
+ #This is brl/b3p/expatpp
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+-if( EXPAT_FOUND )
+-
+-  if( VXL_USING_NATIVE_EXPAT )
+-    include_directories( ${EXPAT_INCLUDE_DIR} )
+-  else()
+-    include_directories( ${BRL_BINARY_DIR}/b3p/expat )
+-  endif()
+-
+-  set( expatpp_sources expatpp.h expatpp.cpp expatpplib.h )
+-
+-  vxl_add_library(LIBRARY_NAME expatpp LIBRARY_SOURCES ${expatpp_sources} )
+-  target_link_libraries( expatpp ${EXPAT_LIBRARIES} )
+-
+-  if( BUILD_TESTING )
+-    add_subdirectory(tests)
+-  endif()
+-
+-
+-endif()
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+diff --git a/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt b/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
+index 11e9d815c3..5797910273 100644
+--- a/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
++++ b/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # bhdfs's Process Library
+ 
+ # bprb depends on expat and bhdfs_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
+index 6328cfd419..bb6a65f96d 100644
+--- a/contrib/brl/bbas/bkml/CMakeLists.txt
++++ b/contrib/brl/bbas/bkml/CMakeLists.txt
+@@ -5,7 +5,7 @@ set(bkml_sources
+   bkml_write.h bkml_write.cxx
+ )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bocl/pro/CMakeLists.txt b/contrib/brl/bbas/bocl/pro/CMakeLists.txt
+index 96e947876d..ba6ba1deb8 100644
+--- a/contrib/brl/bbas/bocl/pro/CMakeLists.txt
++++ b/contrib/brl/bbas/bocl/pro/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ # bprb depends on expat and boxm_ocl_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bbas/bvgl/CMakeLists.txt b/contrib/brl/bbas/bvgl/CMakeLists.txt
+index c4da5b9d28..260bcf1d88 100644
+--- a/contrib/brl/bbas/bvgl/CMakeLists.txt
++++ b/contrib/brl/bbas/bvgl/CMakeLists.txt
+@@ -37,7 +37,8 @@ aux_source_directory(Templates bvgl_sources)
+ 
+ 
+ #find expatpp library for
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
+index afa5d22968..40327fb9ea 100644
+--- a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
++++ b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
+@@ -14,7 +14,7 @@
+ #include <string>
+ #include <iostream>
+ #include <sstream>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ #ifdef _MSC_VER
+ #  include <vcl_msvc_warnings.h>
+ #endif
+diff --git a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
+index 76995137ed..1cb0736454 100644
+--- a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
++++ b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
+@@ -16,7 +16,8 @@ set(bvgl_test_sources
+ )
+ 
+ #Make sure expat library is found
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+   set(bvgl_test_sources ${bvgl_test_sources} test_bvgl_labelme_parser.cxx)
+diff --git a/contrib/brl/bbas/bwm/CMakeLists.txt b/contrib/brl/bbas/bwm/CMakeLists.txt
+index 4a16a57d9e..72ea30dc37 100644
+--- a/contrib/brl/bbas/bwm/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/CMakeLists.txt
+@@ -26,7 +26,8 @@ endif()
+ 
+ include( ${BRL_MODULE_PATH}/FindSHAPELIB.cmake )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ # Set CMake options for using vgui
+ include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
+diff --git a/contrib/brl/bbas/bwm/io/CMakeLists.txt b/contrib/brl/bbas/bwm/io/CMakeLists.txt
+index 918c196161..f0ea9a69c9 100644
+--- a/contrib/brl/bbas/bwm/io/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/io/CMakeLists.txt
+@@ -8,7 +8,8 @@ set(bwm_io_sources
+ )
+ aux_source_directory(Templates bwm_io_sources)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bwm/pro/CMakeLists.txt b/contrib/brl/bbas/bwm/pro/CMakeLists.txt
+index 920f31413c..21949a782c 100644
+--- a/contrib/brl/bbas/bwm/pro/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/pro/CMakeLists.txt
+@@ -9,7 +9,8 @@ set(bwm_pro_sources
+     bwm_register.h    bwm_register.cxx
+ )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bwm/video/CMakeLists.txt b/contrib/brl/bbas/bwm/video/CMakeLists.txt
+index 5408fe77a7..0787b9a74e 100644
+--- a/contrib/brl/bbas/bwm/video/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/video/CMakeLists.txt
+@@ -11,7 +11,8 @@ set(bwm_video_sources
+                                  bwm_video_site_io_defs.h
+ )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
+index ca3c490d5e..d232649ccb 100644
+--- a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # This is contrib/bwm/exe/CMakeLists.txt
+ # World Modeling GUI executables
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+   if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bxml/CMakeLists.txt b/contrib/brl/bbas/bxml/CMakeLists.txt
+index c027dfaa28..72fed69f82 100644
+--- a/contrib/brl/bbas/bxml/CMakeLists.txt
++++ b/contrib/brl/bbas/bxml/CMakeLists.txt
+@@ -12,7 +12,8 @@ set( bxml_sources
+     bxml_find.cxx                bxml_find.h
+ )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+@@ -28,13 +29,15 @@ aux_source_directory(Templates bxml_sources)
+ 
+ vxl_add_library(LIBRARY_NAME bxml LIBRARY_SOURCES ${bxml_sources})
+ 
+-target_link_libraries( bxml ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl )
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+-  target_link_libraries( bxml ${EXPATPP_LIBRARIES})
++  target_link_libraries( bxml ${EXPATPP_LIBRARIES} ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl )
+  endif()
++else()
++  target_link_libraries( bxml ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl )
+ endif()
+ 
++
+ add_subdirectory(bsvg)
+ 
+ if( BUILD_TESTING )
+diff --git a/contrib/brl/bbas/volm/CMakeLists.txt b/contrib/brl/bbas/volm/CMakeLists.txt
+index 72b3b217ea..fe8cf45b75 100644
+--- a/contrib/brl/bbas/volm/CMakeLists.txt
++++ b/contrib/brl/bbas/volm/CMakeLists.txt
+@@ -6,7 +6,8 @@
+ include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
+ if(HAS_GEOTIFF)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   if(EXPATPP_FOUND)
+ 
+diff --git a/contrib/brl/bbas/volm/volm_osm_parser.h b/contrib/brl/bbas/volm/volm_osm_parser.h
+index 82283250dd..289d5d5265 100644
+--- a/contrib/brl/bbas/volm/volm_osm_parser.h
++++ b/contrib/brl/bbas/volm/volm_osm_parser.h
+@@ -20,7 +20,7 @@
+ #include <map>
+ #include <vector>
+ #include <utility>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ #ifdef _MSC_VER
+ #  include <vcl_msvc_warnings.h>
+ #endif
+diff --git a/contrib/brl/bmods/FindEXPAT.cmake b/contrib/brl/bmods/FindEXPAT.cmake
+index 2be7c9a963..cefa9c0a0e 100644
+--- a/contrib/brl/bmods/FindEXPAT.cmake
++++ b/contrib/brl/bmods/FindEXPAT.cmake
+@@ -27,6 +27,10 @@ if(NOT EXPAT_FOUND)
+     if(EXPAT_FOUND)
+       set(VXL_USING_NATIVE_EXPAT "YES")
+     endif()
++    find_package(EXPATPP)
++    if(EXPATPP_FOUND)
++      set(VXL_USING_NATIVE_EXPATPP "YES")
++    endif()
+   endif()
+ 
+ 
+@@ -48,40 +52,3 @@ if(NOT EXPAT_FOUND)
+ 
+ endif()
+ #mark_as_advanced(EXPAT_INCLUDE_DIR EXPAT_LIBRARY)
+-
+-if(EXPAT_FOUND) # EXPATPP requires EXPAT
+-  find_path(EXPATPP_SYSTEM_INCLUDE_DIR NAMES expatpp.h )
+-  find_library(EXPATPP_SYSTEM_LIBRARY NAMES expatpp libexpatpp )
+-
+-  if( EXPATPP_SYSTEM_INCLUDE_DIR AND EXPATPP_SYSTEM_LIBRARY )
+-    set(VXL_USING_NATIVE_EXPATPP "YES")
+-    set(EXPATPP_LIBRARIES ${EXPATPP_SYSTEM_LIBRARY})
+-    set(EXPATPP_INCLUDE_DIRS ${EXPATPP_SYSTEM_INCLUDE_DIR})
+-  else()
+-    set(VXL_USING_NATIVE_EXPATPP NO)
+-    if(EXISTS ${VXL_ROOT_SOURCE_DIR}/contrib/brl/b3p/expatpp/expatpp.h)
+-      set( EXPATPP_FOUND YES )
+-      set( EXPATPP_LIBRARIES expatpp )
+-      set( EXPATPP_LIBRARY expatpp )
+-      set( EXPATPP_INCLUDE_DIRS ${VXL_ROOT_SOURCE_DIR}/contrib/brl/b3p/expatpp ${BRL_BINARY_DIR}/b3p/expatpp )
+-      set( EXPATPP_INCLUDE_DIR ${VXL_ROOT_SOURCE_DIR}/contrib/brl/b3p/expatpp ${BRL_BINARY_DIR}/b3p/expatpp )
+-      set( EXPATPP_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/vxl/contrib/brl/b3p/expatpp)
+-    else()
+-      unset(EXPATPP_SYSTEM_INCLUDE_DIR) #If not found, keep out of cmake window
+-      unset(EXPATPP_SYSTEM_LIBRARY)  # If not found, keep out of cmake window
+-      unset(EXPATPP_LIBRARIES)
+-      unset(EXPATPP_INCLUDE_DIRS)
+-      unset(EXPAT_FOUND)
+-      unset(EXPATPP_FOUND)
+-    endif()
+-  endif()
+-
+-  include(FindPackageHandleStandardArgs)
+-  # FOUND_VAR EXPATPP_FOUND  not supported in cmake 2.8.9
+-  FIND_PACKAGE_HANDLE_STANDARD_ARGS( EXPATPP
+-             REQUIRED_VARS EXPATPP_LIBRARY EXPATPP_INCLUDE_DIR
+-             FAIL_MESSAGE "MISSING: "
+-     )
+-endif()
+-mark_as_advanced(EXPATPP_SYSTEM_INCLUDE_DIR EXPATPP_SYSTEM_LIBRARY)
+-mark_as_advanced(EXPATPP_INCLUDE_DIR EXPATPP_LIBRARY)
+diff --git a/contrib/brl/bpro/CMakeLists.txt b/contrib/brl/bpro/CMakeLists.txt
+index 637c1ecfa8..bb3562f59d 100644
+--- a/contrib/brl/bpro/CMakeLists.txt
++++ b/contrib/brl/bpro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # brl/bpro/CMakeLists.txt
+ # main package for processing operations
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ # Basic process classes
+diff --git a/contrib/brl/bpro/bprb/tests/CMakeLists.txt b/contrib/brl/bpro/bprb/tests/CMakeLists.txt
+index cfb865611a..954315f1bd 100644
+--- a/contrib/brl/bpro/bprb/tests/CMakeLists.txt
++++ b/contrib/brl/bpro/bprb/tests/CMakeLists.txt
+@@ -1,6 +1,10 @@
+ # brl/bpro/bprb/tests/CMakeLists.txt
+ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/params.xml
+                 ${CMAKE_CURRENT_BINARY_DIR}/params.xml)
++
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
++
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+ 
+@@ -10,7 +14,7 @@ if(EXPAT_FOUND)
+    test_process_params.cxx
+    bprb_test_process.h bprb_test_process.cxx
+   )
+-  target_link_libraries( bprb_test_all bprb ${VXL_LIB_PREFIX}testlib expat expatpp)
++  target_link_libraries( bprb_test_all bprb ${VXL_LIB_PREFIX}testlib ${EXPAT_LIBRARIES} ${EXPATPP_LIBRARIES})
+ 
+   add_test( NAME bprb_test_process COMMAND $<TARGET_FILE:bprb_test_all> test_process )
+   add_test( NAME bprb_test_process_params COMMAND $<TARGET_FILE:bprb_test_all> test_process_params )
+diff --git a/contrib/brl/bseg/bbgm/pro/CMakeLists.txt b/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
+index 013afc8146..365ef65b67 100644
+--- a/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ # brl/bseg/bbgm/pro/CMakeLists.txt
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
+index fb0836b415..0dfcfc9795 100644
+--- a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # contrib/brl/bseg/bbgm_batch/CMakeLists.txt
+ 
+ if( PYTHONLIBS_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     if(EXPATPP_FOUND)
+     include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
+diff --git a/contrib/brl/bseg/betr_batch/CMakeLists.txt b/contrib/brl/bseg/betr_batch/CMakeLists.txt
+index 20df829930..5321bd017e 100644
+--- a/contrib/brl/bseg/betr_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/betr_batch/CMakeLists.txt
+@@ -2,7 +2,8 @@
+ project( betr_batch )
+ 
+ if( PYTHONLIBS_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+index 76fe0891b7..7c73fe1bb0 100644
+--- a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+@@ -9,7 +9,8 @@ if(ZLIB_FOUND)
+ endif()
+ 
+ # bprb depends on expat and bmdl_prodepends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
+   if(TIFF_FOUND)
+diff --git a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
+index fb7fcb176d..52aa721a3f 100644
+--- a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # contrib/brl/bseg/bmdl_batch/CMakeLists.txt
+ 
+ if( PYTHONLIBS_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+    if(EXPATPP_FOUND)
+     include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
+diff --git a/contrib/brl/bseg/boxm2/CMakeLists.txt b/contrib/brl/bseg/boxm2/CMakeLists.txt
+index 4475e418be..476d43b151 100644
+--- a/contrib/brl/bseg/boxm2/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/CMakeLists.txt
+@@ -21,7 +21,8 @@ set(boxm2_sources
+     boxm2_blocks_vis_graph.h          boxm2_blocks_vis_graph.cxx
+    )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ 
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h b/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
+index d87dc359fe..94f764c61d 100644
+--- a/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
++++ b/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
+@@ -4,7 +4,7 @@
+ #include <string>
+ #include <iostream>
+ #include <map>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ 
+ #include <boxm2/basic/boxm2_block_id.h>
+ #include <boxm2/boxm2_block_metadata.h>
+diff --git a/contrib/brl/bseg/boxm2/boxm2_scene_parser.h b/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
+index 963a8a803d..b697652f36 100644
+--- a/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
++++ b/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
+@@ -4,7 +4,7 @@
+ #include <string>
+ #include <iostream>
+ #include <map>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ 
+ #include <boxm2/basic/boxm2_block_id.h>
+ #include <boxm2/boxm2_block_metadata.h>
+diff --git a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
+index ca91150930..7c2ec1d9c3 100644
+--- a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm2's Process Library
+ 
+ # bprb depends on expat and boxm2_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
+index 082696b982..605e90bb61 100644
+--- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
++++ b/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
+@@ -31,8 +31,8 @@
+ #include <bmsh3d/bmsh3d_mesh.h>
+ #include <bmsh3d/algo/bmsh3d_fileio.h>
+ #include <bmsh3d/bmsh3d_mesh_mc.h>
+-#include "vgl/vgl_intersection.h"
+-#include <expatpplib.h>
++#include <vgl/vgl_intersection.h>
++#include <expatpp.h>
+ #include <boxm2/boxm2_bounding_box_parser.h>
+ 
+ namespace boxm2_ingest_convex_mesh_process_globals
+diff --git a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
+index 923e37f35f..064003f994 100644
+--- a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ # This is contrib/brl/bseg/boxm2/volm/CMakeLists
+ # volm depends on bkml and expat
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   if(EXPATPP_FOUND)
+ 
+diff --git a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
+index 6ad0bdde83..265cd5d066 100644
+--- a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm2's Process Library
+ 
+ # bprb depends on expat and boxm2_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+diff --git a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
+index 9e1c59a967..c7eb640d55 100644
+--- a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
+@@ -7,7 +7,8 @@ include( ${BRL_CMAKE_DIR}/FindHadoop.cmake )
+ include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
+ 
+ if( PYTHONLIBS_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
+index c0330db1e2..68ab30dffc 100644
+--- a/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm2 multi gpu or cpu Process Library
+ 
+ # bprb depends on expat and boxm2_multi_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bseg )
+   set(boxm2_multi_pro_sources
+diff --git a/contrib/brl/bseg/brec_batch/CMakeLists.txt b/contrib/brl/bseg/brec_batch/CMakeLists.txt
+index a3ab77b316..e228152f4b 100644
+--- a/contrib/brl/bseg/brec_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/brec_batch/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # contrib/brl/bseg/brec_batch/CMakeLists.txt
+ 
+ if( PYTHONLIBS_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bstm/CMakeLists.txt b/contrib/brl/bseg/bstm/CMakeLists.txt
+index 977d68fdab..77205c2e6b 100644
+--- a/contrib/brl/bseg/bstm/CMakeLists.txt
++++ b/contrib/brl/bseg/bstm/CMakeLists.txt
+@@ -15,7 +15,8 @@ set(bstm_sources bstm_block_metadata.h bstm_block_metadata.cxx
+                  bstm_time_block.h bstm_time_block.cxx
+                  bstm_util.cxx bstm_util.h)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bseg/bstm/bstm_scene_parser.h b/contrib/brl/bseg/bstm/bstm_scene_parser.h
+index 325aee9239..f1b519d12f 100644
+--- a/contrib/brl/bseg/bstm/bstm_scene_parser.h
++++ b/contrib/brl/bseg/bstm/bstm_scene_parser.h
+@@ -4,7 +4,7 @@
+ #include <string>
+ #include <iostream>
+ #include <map>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ 
+ #include <bstm/basic/bstm_block_id.h>
+ #include <bstm/bstm_block_metadata.h>
+diff --git a/contrib/brl/bseg/bstm_batch/CMakeLists.txt b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
+index e548807de5..b2b047f3b6 100644
+--- a/contrib/brl/bseg/bstm_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
+@@ -10,7 +10,8 @@ if(DIRECTSHOW_FOUND)
+ endif()
+ 
+ if( PYTHONLIBS_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bstm_multi/CMakeLists.txt b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
+index ba8815fe6b..1f57d0d958 100644
+--- a/contrib/brl/bseg/bstm_multi/CMakeLists.txt
++++ b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
+@@ -15,7 +15,8 @@ set(bstm_multi_sources
+   space_time_scene_parser.h space_time_scene_parser.hxx
+   )
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if (EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h b/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h
+index 062a2eda8f..c5108c1018 100644
+--- a/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h
++++ b/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h
+@@ -20,7 +20,7 @@
+ #include <map>
+ #include <string>
+ #include <vector>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ 
+ #ifdef _MSC_VER
+ #  include <vcl_msvc_warnings.h>
+diff --git a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
+index 25433e56f2..f3659d5390 100644
+--- a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # This is contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+ # The kernel-related files for Brown Voxel Processing Library (BVPL)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ include_directories( ${EXPAT_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+index 0672b5d3d8..615f02e3fa 100644
+--- a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # This is contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
+ # The kernel-related files for Brown Voxel Processing Library (BVPL)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ include_directories( ${EXPAT_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
+index 82ce0655e0..3e7108103d 100644
+--- a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
+@@ -2,7 +2,8 @@
+ # BVPL kenel's related processes
+ 
+ # bprb depends on expat and bvxm_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/bvpl/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
+index 3f4b2b26bc..03b7df907e 100644
+--- a/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
+@@ -2,7 +2,8 @@
+ # bvpl's Process Library
+ 
+ # bprb depends on expat and bvpl_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
+index 754741a408..9c629d4e5e 100644
+--- a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # contrib/brl/bseg/bvpl_batch/CMakeLists.txt
+ 
+ if( PYTHONLIBS_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvxm/CMakeLists.txt b/contrib/brl/bseg/bvxm/CMakeLists.txt
+index d637fead62..caa2ff3f35 100644
+--- a/contrib/brl/bseg/bvxm/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/CMakeLists.txt
+@@ -38,7 +38,8 @@ set(bvxm_sources
+ aux_source_directory(Templates bvxm_sources)
+ 
+ #find expatpp library for bvxm_world_params parser
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
+index e07b20ebb7..3a0824d257 100644
+--- a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # bvxm_algo Process Library
+ 
+ # bprb depends on expat and this process library depends on bprb
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+  if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+diff --git a/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h b/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
+index e58cf620f5..d707da04db 100644
+--- a/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
++++ b/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
+@@ -6,7 +6,7 @@
+ #include <string>
+ #include <iostream>
+ #include <sstream>
+-#include <expatpplib.h>
++#include <expatpp.h>
+ #ifdef _MSC_VER
+ #  include <vcl_msvc_warnings.h>
+ #endif
+diff --git a/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
+index c2901f9c90..a41c67e514 100644
+--- a/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
+@@ -2,7 +2,8 @@
+ # bvxm's Process Library
+ 
+ # bprb depends on expat and bvxm_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/bvxm/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
+index 6c98f11cc3..e5b88b5aff 100644
+--- a/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
+@@ -2,7 +2,8 @@
+ # bvxm's Process Library
+ 
+ # bprb depends on expat and bvxm_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${EXPAT_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+diff --git a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
+index fee846b6d0..2044353da0 100644
+--- a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
+@@ -3,6 +3,8 @@ if(HAS_GEOTIFF)
+ 
+ if( PYTHONLIBS_FOUND )
+   include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++  FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
+index 76defad7a7..1cfd293103 100644
+--- a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
++++ b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
+@@ -5,7 +5,8 @@ if(OpenCL_FOUND)
+   include_directories( ${MUL_INCLUDE_DIR} )
+ 
+   #find expatpp library
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if(EXPAT_FOUND)
+     include_directories( ${EXPAT_INCLUDE_DIR} )
+     include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
+diff --git a/contrib/brl/bseg/vcon/CMakeLists.txt b/contrib/brl/bseg/vcon/CMakeLists.txt
+index 26504576be..ed189bccd7 100644
+--- a/contrib/brl/bseg/vcon/CMakeLists.txt
++++ b/contrib/brl/bseg/vcon/CMakeLists.txt
+@@ -4,7 +4,8 @@
+ include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
+ if(HAS_GEOTIFF)
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   if(EXPATPP_FOUND)
+     include_directories( ${BRL_INCLUDE_DIR} )
+-- 
+2.46.1
+

0003-Use-system-rply.patch

@@ -1,71 +0,0 @@
-From 2a338e6b27483b775d6ab0a6ba2661eb6231ac50 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:15:37 +0200
-Subject: [PATCH 03/23] Use system rply
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt |  6 ++++--
- v3p/CMakeLists.txt                          |  1 -
- v3p/rply/CMakeLists.txt                     | 13 -------------
- 3 files changed, 4 insertions(+), 16 deletions(-)
- delete mode 100644 v3p/rply/CMakeLists.txt
-
-diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-index d96bf35..c8be547 100644
---- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-+++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-@@ -1,8 +1,10 @@
- # This is bbas/bmsh3d/algo/CMakeLists.txt
- # Brown 3D Mesh Algorithm Library
- 
-+FIND_PACKAGE(rply REQUIRED)
-+
- INCLUDE_DIRECTORIES( ${BRL_INCLUDE_DIR} )
--INCLUDE_DIRECTORIES( ${VTHREEP_INCLUDE_DIR}/rply )
-+INCLUDE_DIRECTORIES( ${RPLY_INCLUDE_DIR} )
- 
- SET( bmsh3d_algo_sources
-   bmsh3d_fileio.cxx           bmsh3d_fileio.h
-@@ -13,7 +15,7 @@ SET( bmsh3d_algo_sources
- )
- 
- ADD_LIBRARY( bmsh3d_algo  ${bmsh3d_algo_sources})
--TARGET_LINK_LIBRARIES( bmsh3d_algo bmsh3d rply vgl vnl vul)
-+TARGET_LINK_LIBRARIES( bmsh3d_algo bmsh3d ${RPLY_LIBRARY} vgl vnl vul)
- 
- IF( BUILD_TESTING )
-   SUBDIRS(tests)
-diff --git a/v3p/CMakeLists.txt b/v3p/CMakeLists.txt
-index dbdb30a..2e300d4 100644
---- a/v3p/CMakeLists.txt
-+++ b/v3p/CMakeLists.txt
-@@ -60,6 +60,5 @@ IF (BUILD_CORE_IMAGING)
-   MARK_AS_ADVANCED( VXL_FORCE_V3P_OPENJPEG2 )
-   SUBDIRS(openjpeg2)
- 
--  SUBDIRS(rply)
- 
- ENDIF (BUILD_CORE_IMAGING)
-diff --git a/v3p/rply/CMakeLists.txt b/v3p/rply/CMakeLists.txt
-deleted file mode 100644
-index 87e7524..0000000
---- a/v3p/rply/CMakeLists.txt
-+++ /dev/null
-@@ -1,13 +0,0 @@
--# This is /v3p/rply/CMakeLists.txt
--# library for reading and writing .PLY file
--
--SET(rply_sources
--  rply.h
--  rply.c
--  )
-- 
--ADD_LIBRARY(rply ${rply_sources})
--
--#install the .h .txx and libs
--INSTALL_TARGETS(/lib rply)
--INSTALL_NOBASE_HEADER_FILES(/include/vxl/rply/brl/ ${rply_sources})
--- 
-1.7.11.7
-

0003-v3.5.0-Use-Fedora-minizip.patch

@@ -0,0 +1,37 @@
+From c0cc5459f8ee3dfc40cefb26487a1449d5100d8e Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 15 Nov 2018 15:31:18 +0000
+Subject: [PATCH 03/18] v3.5.0 Use Fedora minizip
+
+---
+ contrib/brl/b3p/CMakeLists.txt                                | 4 ----
+ .../bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx    | 1 +
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/contrib/brl/b3p/CMakeLists.txt b/contrib/brl/b3p/CMakeLists.txt
+index 7fefd89f41..b2f4b5f6bd 100644
+--- a/contrib/brl/b3p/CMakeLists.txt
++++ b/contrib/brl/b3p/CMakeLists.txt
+@@ -19,7 +19,3 @@ add_subdirectory(expatpp)
+ option( VXL_FORCE_B3P_SHAPELIB "Use B3P instead of any native SHAPELIB library?" YES)
+ mark_as_advanced( VXL_FORCE_B3P_SHAPELIB )
+ add_subdirectory(shapelib)
+-
+-add_subdirectory(minizip)
+-
+-
+diff --git a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
+index daf78da93f..1a2241adbf 100644
+--- a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
++++ b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
+@@ -38,6 +38,7 @@
+ 
+ #if HAS_ZLIB
+ #include <minizip/zip.h>
++#include <zlib.h>
+ #endif
+ 
+ #define WRITEBUFFERSIZE (16384)
+-- 
+2.46.1
+

0004-Added-more-soname.patch

@@ -1,53 +0,0 @@
-From 4c5770c15c0ba12e4d11ec3e00b0d5852636aa76 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:16:38 +0200
-Subject: [PATCH 04/23] Added more soname
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- CMakeLists.txt               | 3 ++-
- core/vil/CMakeLists.txt      | 1 +
- core/vil/algo/CMakeLists.txt | 1 +
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 67b2ea4..71f48bc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,7 +29,8 @@ SET(VCL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- SET(VNL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- SET(VNL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- SET(TESTLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
--
-+SET(VIL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-+SET(VIL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- 
- 
- SET( LIBRARY_OUTPUT_PATH ${vxl_BINARY_DIR}/lib CACHE PATH
-diff --git a/core/vil/CMakeLists.txt b/core/vil/CMakeLists.txt
-index 75b660a..d297412 100644
---- a/core/vil/CMakeLists.txt
-+++ b/core/vil/CMakeLists.txt
-@@ -330,6 +330,7 @@ IF(OPENJPEG2_FOUND)
-   TARGET_LINK_LIBRARIES( vil ${OPENJPEG2_LIBRARIES} )
- ENDIF(OPENJPEG2_FOUND)
- 
-+SET_TARGET_PROPERTIES(vil PROPERTIES ${VIL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vil vcl )
- 
- IF (NOT UNIX)
-diff --git a/core/vil/algo/CMakeLists.txt b/core/vil/algo/CMakeLists.txt
-index e9f2119..a7ab0d7 100644
---- a/core/vil/algo/CMakeLists.txt
-+++ b/core/vil/algo/CMakeLists.txt
-@@ -58,6 +58,7 @@ AUX_SOURCE_DIRECTORY(Templates vil_algo_sources)
- 
- ADD_LIBRARY(vil_algo ${vil_algo_sources})
- 
-+SET_TARGET_PROPERTIES(vil_algo PROPERTIES ${VIL_ALGO_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vil_algo vil vnl_algo vnl vcl )
- 
- INSTALL_TARGETS(/lib vil_algo)
--- 
-1.7.11.7
-

0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch

@@ -0,0 +1,108 @@
+From 04c541d97aeb5ccc75615dd537e8a64c1e1f3814 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 25 Apr 2019 14:11:31 +0100
+Subject: [PATCH 04/18] v3.5.0 Add cmake module to find RPLY
+
+---
+ CMakeLists.txt                                |  3 +-
+ config/cmake/fedora-modules/FindRPLY.cmake    | 39 +++++++++++++++++++
+ contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt   |  2 +-
+ contrib/brl/bseg/boxm2/cpp/CMakeLists.txt     |  2 +-
+ .../brl/bseg/boxm2/cpp/algo/CMakeLists.txt    |  2 +-
+ 5 files changed, 44 insertions(+), 4 deletions(-)
+ create mode 100644 config/cmake/fedora-modules/FindRPLY.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e52a8c0abb..e1aa0390d4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,7 +142,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/config/cmake/doxygen/doxygen.cmake)
+ 
+ # Location of VXL's FindXXX.cmake CMake modules.
+ # This is identical to VXL_CMAKE_DIR.  Perhaps we should eliminate MODULE_PATH?
+-set( MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/config/cmake/Modules CACHE STATIC "VXL module path" )
++set( MODULE_PATH "${CMAKE_SOURCE_DIR}/config/cmake/Modules" CACHE PATH "VXL module path" )
++set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/cmake/fedora-modules")
+ 
+ # Options to add extra compiler and linker flags
+ #
+diff --git a/config/cmake/fedora-modules/FindRPLY.cmake b/config/cmake/fedora-modules/FindRPLY.cmake
+new file mode 100644
+index 0000000000..abe415bd9e
+--- /dev/null
++++ b/config/cmake/fedora-modules/FindRPLY.cmake
+@@ -0,0 +1,39 @@
++# Adapted from https://github.com/jirihnidek/verse-ply-uploader/blob/master/build_files/cmake/modules/FindRPLY.cmake
++# This module tries to find RPLY library and include files
++#
++# RPLY_INCLUDE_DIR, where to find verse.h
++# RPLY_LIBRARY_DIR, where to find libverse.so
++# RPLY_LIBRARIES, the library to link against
++# RPLY_FOUND, IF false, do not try to use Verse
++#
++
++FIND_PATH ( RPLY_INCLUDE_DIR rply.h
++    /usr/include
++    /usr/include/rply
++    /usr/local/include
++    /usr/local/include/rply
++)
++
++FIND_LIBRARY ( RPLY_LIBRARIES rply
++    /usr/local/lib
++    /usr/local/lib64
++    /usr/lib
++    /usr/lib64
++)
++
++GET_FILENAME_COMPONENT( RPLY_LIBRARY_DIR ${RPLY_LIBRARIES} PATH )
++
++SET ( RPLY_FOUND "NO" )
++IF ( RPLY_INCLUDE_DIR )
++    IF ( RPLY_LIBRARIES )
++        SET ( RPLY_LIBRARY ${RPLY_LIBRARIES} )
++        SET ( RPLY_FOUND "YES" )
++    ENDIF ( RPLY_LIBRARIES )
++ENDIF ( RPLY_INCLUDE_DIR )
++
++MARK_AS_ADVANCED (
++    RPLY_LIBRARY_DIR
++    RPLY_INCLUDE_DIR
++    RPLY_LIBRARIES
++    RPLY_LIBRARY
++)
+diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
+index 662ec284e9..1c2e6a7089 100644
+--- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
++++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ # This is bbas/bmsh3d/algo/CMakeLists.txt
+ # Brown 3D Mesh Algorithm Library
+-FIND_PACKAGE(rply REQUIRED)
++FIND_PACKAGE(RPLY REQUIRED)
+ 
+ include_directories( ${BRL_INCLUDE_DIR} )
+ include_directories( ${RPLY_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
+index fff9ae2d84..d7ef6ed5fa 100644
+--- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-FIND_PACKAGE(rply REQUIRED)
++FIND_PACKAGE(RPLY REQUIRED)
+ 
+ include_directories( ${BRL_INCLUDE_DIR}/bseg )
+ include_directories( ${RPLY_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
+index c3ed4ed27d..19763fbd71 100644
+--- a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-FIND_PACKAGE(rply REQUIRED)
++FIND_PACKAGE(RPLY REQUIRED)
+ 
+ include_directories( ${BRL_INCLUDE_DIR}/bseg )
+ include_directories( ${MUL_INCLUDE_DIR} )
+-- 
+2.46.1
+

0005-Do-not-build-OUL.patch

@@ -1,26 +0,0 @@
-From dd4f9c285bba2b49eadfa4cbf4759ca00e731235 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:18:42 +0200
-Subject: [PATCH 05/23] Do not build OUL
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
-index 03ee1b5..b228422 100644
---- a/contrib/CMakeLists.txt
-+++ b/contrib/CMakeLists.txt
-@@ -18,7 +18,7 @@ IF( EXISTS ${vxl_SOURCE_DIR}/contrib/mul/CMakeLists.txt )
- ENDIF( EXISTS ${vxl_SOURCE_DIR}/contrib/mul/CMakeLists.txt )
- 
- IF( EXISTS ${vxl_SOURCE_DIR}/contrib/oul/CMakeLists.txt )
--  OPTION(BUILD_OUL "Build the Otago University library package?" YES)
-+  OPTION(BUILD_OUL "Build the Otago University library package?" NO)
- ENDIF( EXISTS ${vxl_SOURCE_DIR}/contrib/oul/CMakeLists.txt )
- 
- IF( EXISTS ${vxl_SOURCE_DIR}/contrib/prip/CMakeLists.txt )
--- 
-1.7.11.7
-

0005-v3.5.0-fix-bkml-test.patch

@@ -0,0 +1,58 @@
+From 8697b5c51bf883e04634d49c45421f2776f59fd3 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 25 Apr 2019 17:05:39 +0100
+Subject: [PATCH 05/18] v3.5.0 fix bkml test
+
+---
+ contrib/brl/bbas/bkml/CMakeLists.txt       |  1 +
+ contrib/brl/bbas/bkml/tests/CMakeLists.txt | 20 ++++++++++++++++----
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
+index bb6a65f96d..e34211b0f6 100644
+--- a/contrib/brl/bbas/bkml/CMakeLists.txt
++++ b/contrib/brl/bbas/bkml/CMakeLists.txt
+@@ -6,6 +6,7 @@ set(bkml_sources
+ )
+ 
+ FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ if(EXPAT_FOUND)
+  if(EXPATPP_FOUND)
+diff --git a/contrib/brl/bbas/bkml/tests/CMakeLists.txt b/contrib/brl/bbas/bkml/tests/CMakeLists.txt
+index 84c36469a4..9eddec1f66 100644
+--- a/contrib/brl/bbas/bkml/tests/CMakeLists.txt
++++ b/contrib/brl/bbas/bkml/tests/CMakeLists.txt
+@@ -1,12 +1,24 @@
+ # This is contrib/brl/bbas/bkml/tests/CMakeLists.txt
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ add_executable(bkml_test_all
+                 test_driver.cxx
+                 test_bkml.cxx
+               )
+ 
+-target_link_libraries(bkml_test_all bkml ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
+-add_test( NAME bkml_test_bkml COMMAND $<TARGET_FILE:bkml_test_all> test_bkml)
++if(EXPAT_FOUND)
++  if(EXPATPP_FOUND)
++    target_link_libraries(bkml_test_all bkml expatpp expat ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
++    add_test( NAME bkml_test_bkml COMMAND $<TARGET_FILE:bkml_test_all> test_bkml)
+ 
+-add_executable(bkml_test_include test_include.cxx )
+-target_link_libraries( bkml_test_include bkml )
++    add_executable(bkml_test_include test_include.cxx )
++    target_link_libraries( bkml_test_include bkml expatpp expat)
++  endif()
++else()
++  target_link_libraries(bkml_test_all bkml ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
++  add_test( NAME bkml_test_bkml COMMAND $<TARGET_FILE:bkml_test_all> test_bkml)
++
++  add_executable(bkml_test_include test_include.cxx )
++  target_link_libraries( bkml_test_include bkml )
++endif()
+-- 
+2.46.1
+

0006-BUG-rplyConfig.cmake-has-wrong-include-path.patch

@@ -1,26 +0,0 @@
-From 21a10dc2f967a985437777ce03248a256c08c133 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:19:39 +0200
-Subject: [PATCH 06/23] BUG: rplyConfig.cmake has wrong include path
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-index c8be547..fe04412 100644
---- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-+++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-@@ -4,7 +4,7 @@
- FIND_PACKAGE(rply REQUIRED)
- 
- INCLUDE_DIRECTORIES( ${BRL_INCLUDE_DIR} )
--INCLUDE_DIRECTORIES( ${RPLY_INCLUDE_DIR} )
-+INCLUDE_DIRECTORIES( /usr/include/rply )
- 
- SET( bmsh3d_algo_sources
-   bmsh3d_fileio.cxx           bmsh3d_fileio.h
--- 
-1.7.11.7
-

0006-v3.5.0-Correct-rply-includedir.patch

@@ -0,0 +1,114 @@
+From 2252a472803e52dd504e243593f32f4312342591 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 25 Apr 2019 23:32:15 +0100
+Subject: [PATCH 06/18] v3.5.0 Correct rply includedir
+
+---
+ contrib/brl/bbas/bvrml/pro/CMakeLists.txt      |  8 +++++++-
+ contrib/brl/bbas/bwm/exe/CMakeLists.txt        |  8 +++++++-
+ contrib/brl/bbas/volm/pro/CMakeLists.txt       |  8 +++++++-
+ contrib/brl/bseg/boxm2/pro/CMakeLists.txt      |  7 +++++++
+ contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt | 10 +++++++++-
+ 5 files changed, 37 insertions(+), 4 deletions(-)
+
+diff --git a/contrib/brl/bbas/bvrml/pro/CMakeLists.txt b/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
+index c1c82d0dd4..3a82f2e050 100644
+--- a/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
++++ b/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
+@@ -4,7 +4,13 @@ if (HAS_GEOTIFF)
+ include_directories( ${BRL_INCLUDE_DIR}/bpro )
+ include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+ include_directories( ${BRL_INCLUDE_DIR}/bbas )
+-include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++
++FIND_PACKAGE(RPLY REQUIRED)
++if(RPLY_FOUND)
++  include_directories( ${RPLY_INCLUDE_DIR} )
++else()
++  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++endif()
+ 
+ set(bvrml_pro_sources
+     bvrml_processes.h
+diff --git a/contrib/brl/bbas/bwm/exe/CMakeLists.txt b/contrib/brl/bbas/bwm/exe/CMakeLists.txt
+index 4b642eb232..43de7db5df 100644
+--- a/contrib/brl/bbas/bwm/exe/CMakeLists.txt
++++ b/contrib/brl/bbas/bwm/exe/CMakeLists.txt
+@@ -1,7 +1,13 @@
+ # This is brl/bbas/bwm/exe/CMakeLists.txt
+ # World Modeling GUI executables
+ 
+-include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++FIND_PACKAGE(RPLY REQUIRED)
++if(RPLY_FOUND)
++  include_directories( ${RPLY_INCLUDE_DIR} )
++else()
++  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++endif()
++
+ include_directories( ${MUL_INCLUDE_DIR} )
+ include_directories( ${OXL_INCLUDE_DIR} )
+ 
+diff --git a/contrib/brl/bbas/volm/pro/CMakeLists.txt b/contrib/brl/bbas/volm/pro/CMakeLists.txt
+index 76c1216a4f..aa028ca71f 100644
+--- a/contrib/brl/bbas/volm/pro/CMakeLists.txt
++++ b/contrib/brl/bbas/volm/pro/CMakeLists.txt
+@@ -4,7 +4,13 @@ if(VXL_BUILD_RPL)
+ include_directories( ${BRL_INCLUDE_DIR}/bbas )
+ include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
+ include_directories( ${MUL_INCLUDE_DIR} )
+-include_directories( ${VTHREEP_INCLUDE_DIR}/rply)
++
++FIND_PACKAGE(RPLY REQUIRED)
++if(RPLY_FOUND)
++  include_directories( ${RPLY_INCLUDE_DIR} )
++else()
++  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++endif()
+ 
+   # The N-dimensional bin structure implementations use rpl/rsdl
+ 
+diff --git a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
+index 7c2ec1d9c3..0536e327fd 100644
+--- a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
+@@ -11,7 +11,14 @@ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bbas )
+   include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+   include_directories( ${GEL_INCLUDE_DIR}/mrc )
++
++FIND_PACKAGE(RPLY REQUIRED)
++if(RPLY_FOUND)
++  include_directories( ${RPLY_INCLUDE_DIR} )
++else()
+   include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++endif()
++
+ 
+   set(boxm2_pro_sources
+       boxm2_processes.h
+diff --git a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
+index 265cd5d066..2ec707047f 100644
+--- a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
+@@ -11,8 +11,16 @@ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bbas )
+   include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+   include_directories( ${GEL_INCLUDE_DIR}/mrc )
++
++FIND_PACKAGE(RPLY REQUIRED)
++if(RPLY_FOUND)
++  include_directories( ${RPLY_INCLUDE_DIR} )
++else()
+   include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
+-if(OpenCL_FOUND)
++endif()
++
++if(OPENCL_FOUND)
++  include_directories( ${OPENCL_INCLUDE_PATH} )
+   set( BOXM2_VOLM_PRO_LIBS boxm2_ocl)
+ endif()
+ 
+-- 
+2.46.1
+

0007-Arguments-of-ply_open-and-create-changed.-Thanks-to-.patch

@@ -1,45 +0,0 @@
-From 48e82457160bf6484c5c15e6cdcc2641349948cd Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:20:58 +0200
-Subject: [PATCH 07/23] Arguments of ply_open and create changed. Thanks to
- Thomas Bouffon for the patch
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/bbas/bmsh3d/algo/bmsh3d_fileio_ply.cxx | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/contrib/brl/bbas/bmsh3d/algo/bmsh3d_fileio_ply.cxx b/contrib/brl/bbas/bmsh3d/algo/bmsh3d_fileio_ply.cxx
-index 3bb2240..8ad4a4d 100644
---- a/contrib/brl/bbas/bmsh3d/algo/bmsh3d_fileio_ply.cxx
-+++ b/contrib/brl/bbas/bmsh3d/algo/bmsh3d_fileio_ply.cxx
-@@ -50,7 +50,7 @@ bool bmsh3d_load_ply (bmsh3d_mesh* M, const char* file)
-   parsed_mesh.mesh = M;
- 
-   // OPEN file
--  p_ply ply = ply_open(file, NULL, 0, NULL);
-+  p_ply ply = ply_open(file, NULL);
-   if (!ply)
-     return false;
- 
-@@ -92,7 +92,7 @@ bool bmsh3d_load_ply_v (bmsh3d_mesh* M, const char* file)
-   parsed_mesh.mesh = M;
- 
-   // OPEN file
--  p_ply ply = ply_open(file, NULL, 0, NULL);
-+  p_ply ply = ply_open(file, NULL);
-   if (!ply)
-     return false;
- 
-@@ -242,7 +242,7 @@ bool bmsh3d_save_ply (bmsh3d_mesh* M, const char* file, bool ascii_mode, vcl_str
-   e_ply_storage_mode storage_mode = (ascii_mode) ? PLY_ASCII : PLY_LITTLE_ENDIAN;
- 
-   // OPEN FILE
--  p_ply oply = ply_create(file, storage_mode, NULL, 0, NULL);
-+  p_ply oply = ply_create(file, storage_mode,NULL);
- 
-   vcl_cerr << "  saving " << file << " :\n\t"
-            << M->vertexmap().size() << " points, "
--- 
-1.7.11.7
-

0008-More-sonames.patch

@@ -1,819 +0,0 @@
-From 0a1e1ce761a79e9856aea1e14dfd177b3d71fec1 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:38:03 +0200
-Subject: [PATCH 08/23] More sonames
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/b3p/minizip/CMakeLists.txt   | 1 +
- contrib/brl/bbas/bdgl/CMakeLists.txt     | 1 +
- contrib/brl/bbas/bdpg/CMakeLists.txt     | 1 +
- contrib/brl/bbas/bgrl/CMakeLists.txt     | 1 +
- contrib/brl/bbas/bnl/CMakeLists.txt      | 1 +
- contrib/brl/bbas/bnl/algo/CMakeLists.txt | 1 +
- contrib/brl/bbas/bsol/CMakeLists.txt     | 1 +
- contrib/brl/bbas/bsta/CMakeLists.txt     | 1 +
- contrib/brl/bbas/btol/CMakeLists.txt     | 1 +
- contrib/brl/bbas/bugl/CMakeLists.txt     | 1 +
- contrib/brl/bbas/bvgl/CMakeLists.txt     | 1 +
- contrib/brl/bseg/brip/CMakeLists.txt     | 1 +
- contrib/brl/bseg/sdet/CMakeLists.txt     | 1 +
- contrib/gel/geml/CMakeLists.txt          | 1 +
- contrib/gel/gevd/CMakeLists.txt          | 1 +
- contrib/gel/gmvl/CMakeLists.txt          | 1 +
- contrib/gel/gst/CMakeLists.txt           | 1 +
- contrib/gel/gtrl/CMakeLists.txt          | 1 +
- contrib/gel/vdgl/CMakeLists.txt          | 1 +
- contrib/gel/vifa/CMakeLists.txt          | 1 +
- contrib/gel/vmal/CMakeLists.txt          | 1 +
- contrib/gel/vsol/CMakeLists.txt          | 1 +
- contrib/gel/vtol/CMakeLists.txt          | 1 +
- contrib/gel/vtol/algo/CMakeLists.txt     | 1 +
- contrib/mul/clsfy/CMakeLists.txt         | 1 +
- contrib/mul/ipts/CMakeLists.txt          | 1 +
- contrib/mul/mbl/CMakeLists.txt           | 1 +
- contrib/mul/pdf1d/CMakeLists.txt         | 1 +
- contrib/mul/vil3d/CMakeLists.txt         | 1 +
- contrib/mul/vil3d/algo/CMakeLists.txt    | 1 +
- contrib/mul/vil3d/io/CMakeLists.txt      | 1 +
- contrib/mul/vimt/CMakeLists.txt          | 1 +
- contrib/mul/vimt/algo/CMakeLists.txt     | 1 +
- contrib/mul/vimt3d/CMakeLists.txt        | 1 +
- contrib/mul/vpdfl/CMakeLists.txt         | 1 +
- contrib/oxl/mvl/CMakeLists.txt           | 1 +
- contrib/oxl/osl/CMakeLists.txt           | 1 +
- contrib/prip/vdtop/CMakeLists.txt        | 1 +
- contrib/prip/vmap/CMakeLists.txt         | 1 +
- contrib/prip/vpyr/CMakeLists.txt         | 1 +
- contrib/rpl/rgrl/CMakeLists.txt          | 1 +
- contrib/rpl/rrel/CMakeLists.txt          | 2 +-
- contrib/rpl/rsdl/CMakeLists.txt          | 1 +
- contrib/tbl/vepl/CMakeLists.txt          | 1 +
- contrib/tbl/vipl/CMakeLists.txt          | 1 +
- core/vbl/CMakeLists.txt                  | 1 +
- core/vbl/io/CMakeLists.txt               | 1 +
- core/vcsl/CMakeLists.txt                 | 1 +
- core/vgl/CMakeLists.txt                  | 1 +
- core/vgl/algo/CMakeLists.txt             | 1 +
- core/vgl/io/CMakeLists.txt               | 1 +
- core/vgl/xio/CMakeLists.txt              | 1 +
- core/vidl/CMakeLists.txt                 | 1 +
- core/vil/io/CMakeLists.txt               | 1 +
- core/vil1/CMakeLists.txt                 | 1 +
- core/vil1/io/CMakeLists.txt              | 1 +
- core/vnl/io/CMakeLists.txt               | 1 +
- core/vnl/xio/CMakeLists.txt              | 1 +
- core/vpl/CMakeLists.txt                  | 1 +
- core/vsl/CMakeLists.txt                  | 1 +
- core/vul/CMakeLists.txt                  | 1 +
- core/vul/io/CMakeLists.txt               | 1 +
- 62 files changed, 62 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/brl/b3p/minizip/CMakeLists.txt b/contrib/brl/b3p/minizip/CMakeLists.txt
-index 5f9c310..02ccbfe 100644
---- a/contrib/brl/b3p/minizip/CMakeLists.txt
-+++ b/contrib/brl/b3p/minizip/CMakeLists.txt
-@@ -22,6 +22,7 @@ IF(WIN32)
- ENDIF(WIN32)
- 
- ADD_LIBRARY( minizip ${minizip_sources} )
-+SET_TARGET_PROPERTIES(minizip PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS( /lib minizip )
- 
- ENDIF(ZLIB_FOUND)
-diff --git a/contrib/brl/bbas/bdgl/CMakeLists.txt b/contrib/brl/bbas/bdgl/CMakeLists.txt
-index a6315f0..90b0856 100644
---- a/contrib/brl/bbas/bdgl/CMakeLists.txt
-+++ b/contrib/brl/bbas/bdgl/CMakeLists.txt
-@@ -20,6 +20,7 @@ SET(bdgl_sources
- )
- 
- ADD_LIBRARY(bdgl ${bdgl_sources})
-+SET_TARGET_PROPERTIES(bdgl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bdgl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bdgl ${bdgl_sources})
- 
-diff --git a/contrib/brl/bbas/bdpg/CMakeLists.txt b/contrib/brl/bbas/bdpg/CMakeLists.txt
-index 40ca6cb..73b4eec 100644
---- a/contrib/brl/bbas/bdpg/CMakeLists.txt
-+++ b/contrib/brl/bbas/bdpg/CMakeLists.txt
-@@ -10,6 +10,7 @@ bdpg_array_dynamic_prg.cxx    bdpg_array_dynamic_prg.h
- AUX_SOURCE_DIRECTORY(Templates bdpg_sources)
- 
- ADD_LIBRARY(bdpg ${bdpg_sources})
-+SET_TARGET_PROPERTIES(bdpg PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bdpg)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bdpg ${bdpg_sources})
- 
-diff --git a/contrib/brl/bbas/bgrl/CMakeLists.txt b/contrib/brl/bbas/bgrl/CMakeLists.txt
-index cd7071c..8a34186 100644
---- a/contrib/brl/bbas/bgrl/CMakeLists.txt
-+++ b/contrib/brl/bbas/bgrl/CMakeLists.txt
-@@ -19,6 +19,7 @@ SET(bgrl_sources
- AUX_SOURCE_DIRECTORY(Templates bgrl_sources)
- 
- ADD_LIBRARY(bgrl ${bgrl_sources})
-+SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bgrl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
- 
-diff --git a/contrib/brl/bbas/bnl/CMakeLists.txt b/contrib/brl/bbas/bnl/CMakeLists.txt
-index 490b3ee..4b17399 100644
---- a/contrib/brl/bbas/bnl/CMakeLists.txt
-+++ b/contrib/brl/bbas/bnl/CMakeLists.txt
-@@ -8,6 +8,7 @@ SET(bnl_sources
-    )
- 
- ADD_LIBRARY(bnl ${bnl_sources})
-+SET_TARGET_PROPERTIES(bnl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bnl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bnl ${bnl_sources})
- 
-diff --git a/contrib/brl/bbas/bnl/algo/CMakeLists.txt b/contrib/brl/bbas/bnl/algo/CMakeLists.txt
-index f0c455a..be88139 100644
---- a/contrib/brl/bbas/bnl/algo/CMakeLists.txt
-+++ b/contrib/brl/bbas/bnl/algo/CMakeLists.txt
-@@ -5,6 +5,7 @@ SET( bnl_algo_sources
- )
- 
- ADD_LIBRARY( bnl_algo ${bnl_algo_sources} )
-+SET_TARGET_PROPERTIES(bnl_algo PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bnl_algo)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bnl/algo ${bnl_algo_sources})
- TARGET_LINK_LIBRARIES( bnl_algo vnl )
-diff --git a/contrib/brl/bbas/bsol/CMakeLists.txt b/contrib/brl/bbas/bsol/CMakeLists.txt
-index 33f6dde..7608c80 100644
---- a/contrib/brl/bbas/bsol/CMakeLists.txt
-+++ b/contrib/brl/bbas/bsol/CMakeLists.txt
-@@ -24,6 +24,7 @@ SET(bsol_sources
- AUX_SOURCE_DIRECTORY(Templates bsol_sources)
- 
- ADD_LIBRARY(bsol ${bsol_sources})
-+SET_TARGET_PROPERTIES(bsol PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bsol)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bsol ${bsol_sources})
- TARGET_LINK_LIBRARIES(bsol vsol vgl_algo vgl vnl vbl)
-diff --git a/contrib/brl/bbas/bsta/CMakeLists.txt b/contrib/brl/bbas/bsta/CMakeLists.txt
-index 9370247..f762491 100644
---- a/contrib/brl/bbas/bsta/CMakeLists.txt
-+++ b/contrib/brl/bbas/bsta/CMakeLists.txt
-@@ -62,6 +62,7 @@ SET(bsta_sources
- 
- AUX_SOURCE_DIRECTORY(Templates bsta_sources)
- ADD_LIBRARY(bsta  ${bsta_sources})
-+SET_TARGET_PROPERTIES(bsta PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bsta)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/bsta ${bsta_sources})
- 
-diff --git a/contrib/brl/bbas/btol/CMakeLists.txt b/contrib/brl/bbas/btol/CMakeLists.txt
-index a80f2ce..d5bcba9 100644
---- a/contrib/brl/bbas/btol/CMakeLists.txt
-+++ b/contrib/brl/bbas/btol/CMakeLists.txt
-@@ -19,6 +19,7 @@ SET(btol_sources
- )
- 
- ADD_LIBRARY(btol ${btol_sources})
-+SET_TARGET_PROPERTIES(btol PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib btol)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/btol ${btol_sources})
- 
-diff --git a/contrib/brl/bbas/bugl/CMakeLists.txt b/contrib/brl/bbas/bugl/CMakeLists.txt
-index f6cc10a..022890b 100644
---- a/contrib/brl/bbas/bugl/CMakeLists.txt
-+++ b/contrib/brl/bbas/bugl/CMakeLists.txt
-@@ -26,6 +26,7 @@ SET(bugl_sources
- AUX_SOURCE_DIRECTORY(Templates bugl_sources)
- 
- ADD_LIBRARY(bugl ${bugl_sources})
-+SET_TARGET_PROPERTIES(bugl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bugl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bugl ${bugl_sources})
- TARGET_LINK_LIBRARIES(bugl vnl vgl_algo vgl vbl)
-diff --git a/contrib/brl/bbas/bvgl/CMakeLists.txt b/contrib/brl/bbas/bvgl/CMakeLists.txt
-index 3d4e456..bcb5e8b 100644
---- a/contrib/brl/bbas/bvgl/CMakeLists.txt
-+++ b/contrib/brl/bbas/bvgl/CMakeLists.txt
-@@ -38,6 +38,7 @@ ENDIF(EXPAT_FOUND)
- 
- #Create BVGL library
- ADD_LIBRARY(bvgl ${bvgl_sources})
-+SET_TARGET_PROPERTIES(bvgl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib bvgl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bvgl ${bvgl_sources})
- TARGET_LINK_LIBRARIES(bvgl vsol vgl_algo vgl_io vgl vnl_algo vnl vil vbl)
-diff --git a/contrib/brl/bseg/brip/CMakeLists.txt b/contrib/brl/bseg/brip/CMakeLists.txt
-index 0e03e27..7864317 100644
---- a/contrib/brl/bseg/brip/CMakeLists.txt
-+++ b/contrib/brl/bseg/brip/CMakeLists.txt
-@@ -40,6 +40,7 @@ SET(brip_sources
- AUX_SOURCE_DIRECTORY(Templates brip_sources)
- 
- ADD_LIBRARY(brip ${brip_sources})
-+SET_TARGET_PROPERTIES(brip PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib brip)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/brip ${brip_sources})
- 
-diff --git a/contrib/brl/bseg/sdet/CMakeLists.txt b/contrib/brl/bseg/sdet/CMakeLists.txt
-index 8d603f5..ffb0445 100644
---- a/contrib/brl/bseg/sdet/CMakeLists.txt
-+++ b/contrib/brl/bseg/sdet/CMakeLists.txt
-@@ -55,6 +55,7 @@ SET(sdet_sources
- AUX_SOURCE_DIRECTORY(Templates sdet_sources)
- 
- ADD_LIBRARY(sdet ${sdet_sources})
-+SET_TARGET_PROPERTIES(sdet PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib sdet)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/sdet ${sdet_sources})
- 
-diff --git a/contrib/gel/geml/CMakeLists.txt b/contrib/gel/geml/CMakeLists.txt
-index 07b4772..8f4b799 100644
---- a/contrib/gel/geml/CMakeLists.txt
-+++ b/contrib/gel/geml/CMakeLists.txt
-@@ -12,6 +12,7 @@ SET(geml_sources
- )
- 
- ADD_LIBRARY(geml ${geml_sources})
-+SET_TARGET_PROPERTIES(geml PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib geml)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/geml ${geml_sources})
- TARGET_LINK_LIBRARIES(geml vil1 vnl)
-diff --git a/contrib/gel/gevd/CMakeLists.txt b/contrib/gel/gevd/CMakeLists.txt
-index 87edfbe..265cb28 100644
---- a/contrib/gel/gevd/CMakeLists.txt
-+++ b/contrib/gel/gevd/CMakeLists.txt
-@@ -33,6 +33,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(gevd ${gevd_sources})
-+SET_TARGET_PROPERTIES(gevd PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib gevd)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gevd ${gevd_sources})
- TARGET_LINK_LIBRARIES(gevd vtol vsol vdgl vil1 vil vnl vgl vbl vul)
-diff --git a/contrib/gel/gmvl/CMakeLists.txt b/contrib/gel/gmvl/CMakeLists.txt
-index 3f99c15..55b1d8c 100644
---- a/contrib/gel/gmvl/CMakeLists.txt
-+++ b/contrib/gel/gmvl/CMakeLists.txt
-@@ -21,6 +21,7 @@ SET(gmvl_sources
- AUX_SOURCE_DIRECTORY(Templates gmvl_sources)
- 
- ADD_LIBRARY(gmvl ${gmvl_sources})
-+SET_TARGET_PROPERTIES(gmvl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib gmvl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gmvl ${gmvl_sources})
- TARGET_LINK_LIBRARIES(gmvl vtol vil1 vnl vbl vcl)
-diff --git a/contrib/gel/gst/CMakeLists.txt b/contrib/gel/gst/CMakeLists.txt
-index e9e5d01..3bb59d6 100644
---- a/contrib/gel/gst/CMakeLists.txt
-+++ b/contrib/gel/gst/CMakeLists.txt
-@@ -17,6 +17,7 @@ SET(gst_sources
- AUX_SOURCE_DIRECTORY(Templates gst_sources)
- 
- ADD_LIBRARY(gst ${gst_sources})
-+SET_TARGET_PROPERTIES(gst PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib gst)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gst ${gst_sources})
- 
-diff --git a/contrib/gel/gtrl/CMakeLists.txt b/contrib/gel/gtrl/CMakeLists.txt
-index c3c79b9..9325960 100644
---- a/contrib/gel/gtrl/CMakeLists.txt
-+++ b/contrib/gel/gtrl/CMakeLists.txt
-@@ -25,6 +25,7 @@ IF(NETLIB_FOUND)
- ENDIF(NETLIB_FOUND)
- 
- ADD_LIBRARY(gtrl ${gtrl_sources})
-+SET_TARGET_PROPERTIES(gtrl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib gtrl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gtrl ${gtrl_sources})
- 
-diff --git a/contrib/gel/vdgl/CMakeLists.txt b/contrib/gel/vdgl/CMakeLists.txt
-index d5d100d..f0792f2 100644
---- a/contrib/gel/vdgl/CMakeLists.txt
-+++ b/contrib/gel/vdgl/CMakeLists.txt
-@@ -23,6 +23,7 @@ SET(vdgl_sources
- AUX_SOURCE_DIRECTORY(Templates vdgl_sources)
- 
- ADD_LIBRARY(vdgl ${vdgl_sources})
-+SET_TARGET_PROPERTIES(vdgl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vdgl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vdgl ${vdgl_sources})
- TARGET_LINK_LIBRARIES(vdgl vsol vgl_algo vgl vnl_algo vnl vbl_io vbl vsl vul vcl)
-diff --git a/contrib/gel/vifa/CMakeLists.txt b/contrib/gel/vifa/CMakeLists.txt
-index a54fac7..8a19e60 100644
---- a/contrib/gel/vifa/CMakeLists.txt
-+++ b/contrib/gel/vifa/CMakeLists.txt
-@@ -31,6 +31,7 @@ SET(vifa_sources
- AUX_SOURCE_DIRECTORY(Templates vifa_sources)
- 
- ADD_LIBRARY(vifa ${vifa_sources})
-+SET_TARGET_PROPERTIES(vifa PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vifa)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vifa ${vifa_sources})
- TARGET_LINK_LIBRARIES(vifa gevd vtol vsol vdgl vnl vgl vbl vul vil vcl)
-diff --git a/contrib/gel/vmal/CMakeLists.txt b/contrib/gel/vmal/CMakeLists.txt
-index 66604bf..63f66f4 100644
---- a/contrib/gel/vmal/CMakeLists.txt
-+++ b/contrib/gel/vmal/CMakeLists.txt
-@@ -37,6 +37,7 @@ AUX_SOURCE_DIRECTORY(Templates vmal_sources)
- 
- 
- ADD_LIBRARY(vmal ${vmal_sources})
-+SET_TARGET_PROPERTIES(vmal PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vmal)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vmal ${vmal_sources})
- 
-diff --git a/contrib/gel/vsol/CMakeLists.txt b/contrib/gel/vsol/CMakeLists.txt
-index 942af24..9fdf889 100644
---- a/contrib/gel/vsol/CMakeLists.txt
-+++ b/contrib/gel/vsol/CMakeLists.txt
-@@ -63,6 +63,7 @@ INCLUDE_DIRECTORIES(${VXLCORE_INCLUDE_DIR})
- AUX_SOURCE_DIRECTORY(Templates vsol_sources)
- 
- ADD_LIBRARY(vsol ${vsol_sources})
-+SET_TARGET_PROPERTIES(vsol PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vsol)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vsol ${vsol_sources})
- TARGET_LINK_LIBRARIES(vsol vgl_algo vgl_io vgl vnl vbl_io vbl vsl vul vcl)
-diff --git a/contrib/gel/vtol/CMakeLists.txt b/contrib/gel/vtol/CMakeLists.txt
-index 7068118..28ab541 100644
---- a/contrib/gel/vtol/CMakeLists.txt
-+++ b/contrib/gel/vtol/CMakeLists.txt
-@@ -35,6 +35,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vtol ${vtol_sources})
-+SET_TARGET_PROPERTIES(vtol PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vtol)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vtol ${vtol_sources})
- TARGET_LINK_LIBRARIES(vtol vdgl vsol vnl vbl vul ${CMAKE_THREAD_LIBS})
-diff --git a/contrib/gel/vtol/algo/CMakeLists.txt b/contrib/gel/vtol/algo/CMakeLists.txt
-index f0edd60..6004217 100644
---- a/contrib/gel/vtol/algo/CMakeLists.txt
-+++ b/contrib/gel/vtol/algo/CMakeLists.txt
-@@ -8,6 +8,7 @@ SET( vtol_algo_sources
- AUX_SOURCE_DIRECTORY( Templates vtol_algo_sources )
- 
- ADD_LIBRARY( vtol_algo ${vtol_algo_sources} )
-+SET_TARGET_PROPERTIES(vtol_algo PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vtol_algo)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vtol/algo ${vtol_algo_sources})
- TARGET_LINK_LIBRARIES( vtol_algo vtol vsol vdgl vil_algo vgl_algo vgl vil vbl )
-diff --git a/contrib/mul/clsfy/CMakeLists.txt b/contrib/mul/clsfy/CMakeLists.txt
-index 9e529ad..2569b87 100644
---- a/contrib/mul/clsfy/CMakeLists.txt
-+++ b/contrib/mul/clsfy/CMakeLists.txt
-@@ -53,6 +53,7 @@ SET(clsfy_sources
- AUX_SOURCE_DIRECTORY(Templates clsfy_sources)
- 
- ADD_LIBRARY(clsfy ${clsfy_sources})
-+SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib clsfy)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/clsfy ${clsfy_sources})
- TARGET_LINK_LIBRARIES(clsfy vpdfl mbl vnl_algo vnl_io vnl vbl vsl vul)
-diff --git a/contrib/mul/ipts/CMakeLists.txt b/contrib/mul/ipts/CMakeLists.txt
-index 54910b6..0d2e31e 100644
---- a/contrib/mul/ipts/CMakeLists.txt
-+++ b/contrib/mul/ipts/CMakeLists.txt
-@@ -16,6 +16,7 @@ SET(ipts_sources
- )
- 
- ADD_LIBRARY(ipts ${ipts_sources})
-+SET_TARGET_PROPERTIES(ipts PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib ipts)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/ipts ${ipts_sources})
- TARGET_LINK_LIBRARIES(ipts vimt_algo vimt vgl vil_algo vil)
-diff --git a/contrib/mul/mbl/CMakeLists.txt b/contrib/mul/mbl/CMakeLists.txt
-index 75b157f..7009c61 100644
---- a/contrib/mul/mbl/CMakeLists.txt
-+++ b/contrib/mul/mbl/CMakeLists.txt
-@@ -121,6 +121,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(mbl ${mbl_sources})
-+SET_TARGET_PROPERTIES(mbl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(mbl vnl_io vnl_algo vgl_io vgl vbl_io vil_io vsl vnl vil vul vbl)
- 
- INSTALL_TARGETS(/lib mbl)
-diff --git a/contrib/mul/pdf1d/CMakeLists.txt b/contrib/mul/pdf1d/CMakeLists.txt
-index 6c26478..aca9219 100644
---- a/contrib/mul/pdf1d/CMakeLists.txt
-+++ b/contrib/mul/pdf1d/CMakeLists.txt
-@@ -49,6 +49,7 @@ SET(pdf1d_sources
- AUX_SOURCE_DIRECTORY(Templates pdf1d_sources)
- 
- ADD_LIBRARY(pdf1d ${pdf1d_sources})
-+SET_TARGET_PROPERTIES(pdf1d PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib pdf1d)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/pdf1d ${pdf1d_sources})
- TARGET_LINK_LIBRARIES( pdf1d mbl vbl vnl_io vnl vsl )
-diff --git a/contrib/mul/vil3d/CMakeLists.txt b/contrib/mul/vil3d/CMakeLists.txt
-index b3fd91f..716ab57 100644
---- a/contrib/mul/vil3d/CMakeLists.txt
-+++ b/contrib/mul/vil3d/CMakeLists.txt
-@@ -49,6 +49,7 @@ SET(vil3d_sources
- AUX_SOURCE_DIRECTORY(Templates vil3d_sources)
- 
- ADD_LIBRARY(vil3d ${vil3d_sources})
-+SET_TARGET_PROPERTIES(vil3d PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vil3d vil vul vsl vcl vnl )
- 
- INSTALL_TARGETS(/lib vil3d)
-diff --git a/contrib/mul/vil3d/algo/CMakeLists.txt b/contrib/mul/vil3d/algo/CMakeLists.txt
-index 3aeeff4..9553ad2 100644
---- a/contrib/mul/vil3d/algo/CMakeLists.txt
-+++ b/contrib/mul/vil3d/algo/CMakeLists.txt
-@@ -36,6 +36,7 @@ SET(vil3d_algo_sources
- AUX_SOURCE_DIRECTORY(Templates vil3d_algo_sources)
- 
- ADD_LIBRARY(vil3d_algo ${vil3d_algo_sources})
-+SET_TARGET_PROPERTIES(vil3d_algo PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vil3d_algo)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vil3d/algo ${vil3d_algo_sources})
- TARGET_LINK_LIBRARIES( vil3d_algo vil3d vil_algo vil vnl vgl )
-diff --git a/contrib/mul/vil3d/io/CMakeLists.txt b/contrib/mul/vil3d/io/CMakeLists.txt
-index 9bb78cc..4a369e6 100644
---- a/contrib/mul/vil3d/io/CMakeLists.txt
-+++ b/contrib/mul/vil3d/io/CMakeLists.txt
-@@ -7,6 +7,7 @@ SET(vil3d_io_sources
- )
- 
- ADD_LIBRARY(vil3d_io ${vil3d_io_sources})
-+SET_TARGET_PROPERTIES(vil3d_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vil3d_io)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vil3d/io ${vil3d_io_sources})
- TARGET_LINK_LIBRARIES( vil3d_io vil3d vil_io )
-diff --git a/contrib/mul/vimt/CMakeLists.txt b/contrib/mul/vimt/CMakeLists.txt
-index ebcab91..3b07187 100644
---- a/contrib/mul/vimt/CMakeLists.txt
-+++ b/contrib/mul/vimt/CMakeLists.txt
-@@ -35,6 +35,7 @@ SET(vimt_sources
- AUX_SOURCE_DIRECTORY(Templates vimt_sources)
- 
- ADD_LIBRARY(vimt ${vimt_sources})
-+SET_TARGET_PROPERTIES(vimt PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vimt)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt ${vimt_sources})
- TARGET_LINK_LIBRARIES(vimt mbl vil_algo vgl vnl vil_io vil )
-diff --git a/contrib/mul/vimt/algo/CMakeLists.txt b/contrib/mul/vimt/algo/CMakeLists.txt
-index 5eb8e8e..215c568 100644
---- a/contrib/mul/vimt/algo/CMakeLists.txt
-+++ b/contrib/mul/vimt/algo/CMakeLists.txt
-@@ -11,6 +11,7 @@ SET( vimt_algo_sources
- )
- 
- ADD_LIBRARY(vimt_algo ${vimt_algo_sources})
-+SET_TARGET_PROPERTIES(vimt_algo PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vimt_algo)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt/algo ${vimt_algo_sources})
- TARGET_LINK_LIBRARIES( vimt_algo vimt vil_algo vgl vcl )
-diff --git a/contrib/mul/vimt3d/CMakeLists.txt b/contrib/mul/vimt3d/CMakeLists.txt
-index 51d053c..93efcbf 100644
---- a/contrib/mul/vimt3d/CMakeLists.txt
-+++ b/contrib/mul/vimt3d/CMakeLists.txt
-@@ -34,6 +34,7 @@ SET(vimt3d_sources
- AUX_SOURCE_DIRECTORY(Templates vimt3d_sources)
- 
- ADD_LIBRARY(vimt3d ${vimt3d_sources})
-+SET_TARGET_PROPERTIES(vimt3d PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vimt3d)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt3d ${vimt3d_sources})
- TARGET_LINK_LIBRARIES(vimt3d vil3d_algo vil3d_io vil3d vimt mbl vnl_algo vgl vnl_io vnl vil vsl vul)
-diff --git a/contrib/mul/vpdfl/CMakeLists.txt b/contrib/mul/vpdfl/CMakeLists.txt
-index 5e258cd..2c0b05b 100644
---- a/contrib/mul/vpdfl/CMakeLists.txt
-+++ b/contrib/mul/vpdfl/CMakeLists.txt
-@@ -37,6 +37,7 @@ SET(vpdfl_sources
- AUX_SOURCE_DIRECTORY(Templates vpdfl_sources)
- 
- ADD_LIBRARY(vpdfl ${vpdfl_sources})
-+SET_TARGET_PROPERTIES(vpdfl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vpdfl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vpdfl ${vpdfl_sources})
- TARGET_LINK_LIBRARIES(vpdfl mbl vnl_algo vnl_io vnl vsl vul)
-diff --git a/contrib/oxl/mvl/CMakeLists.txt b/contrib/oxl/mvl/CMakeLists.txt
-index d2bf196..878be51 100644
---- a/contrib/oxl/mvl/CMakeLists.txt
-+++ b/contrib/oxl/mvl/CMakeLists.txt
-@@ -113,6 +113,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(mvl ${mvl_sources})
-+SET_TARGET_PROPERTIES(mvl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib mvl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/mvl ${mvl_sources})
- TARGET_LINK_LIBRARIES(mvl vil1 vnl_algo vnl vbl vgl vgl_algo vul)
-diff --git a/contrib/oxl/osl/CMakeLists.txt b/contrib/oxl/osl/CMakeLists.txt
-index a5a0fff..d399b31 100644
---- a/contrib/oxl/osl/CMakeLists.txt
-+++ b/contrib/oxl/osl/CMakeLists.txt
-@@ -45,6 +45,7 @@ SET(osl_sources
- AUX_SOURCE_DIRECTORY(Templates osl_sources)
- 
- ADD_LIBRARY(osl ${osl_sources})
-+SET_TARGET_PROPERTIES(osl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib osl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/osl ${osl_sources})
- TARGET_LINK_LIBRARIES(osl vnl_algo vnl vgl vil1 vbl)
-diff --git a/contrib/prip/vdtop/CMakeLists.txt b/contrib/prip/vdtop/CMakeLists.txt
-index 9723450..feee0c2 100644
---- a/contrib/prip/vdtop/CMakeLists.txt
-+++ b/contrib/prip/vdtop/CMakeLists.txt
-@@ -26,6 +26,7 @@ SET(vdtop_sources
- )
- 
- ADD_LIBRARY(vdtop ${vdtop_sources})
-+SET_TARGET_PROPERTIES(vdtop PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vdtop)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vdtop ${vdtop_sources})
- TARGET_LINK_LIBRARIES(vdtop vmap vil)
-diff --git a/contrib/prip/vmap/CMakeLists.txt b/contrib/prip/vmap/CMakeLists.txt
-index 5c8938b..051ffc2 100644
---- a/contrib/prip/vmap/CMakeLists.txt
-+++ b/contrib/prip/vmap/CMakeLists.txt
-@@ -28,6 +28,7 @@ SET(vmap_sources
- )
- 
- ADD_LIBRARY(vmap ${vmap_sources})
-+SET_TARGET_PROPERTIES(vmap PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vmap)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vmap ${vmap_sources})
- TARGET_LINK_LIBRARIES(vmap vcl)
-diff --git a/contrib/prip/vpyr/CMakeLists.txt b/contrib/prip/vpyr/CMakeLists.txt
-index 0074833..d1a4dda 100644
---- a/contrib/prip/vpyr/CMakeLists.txt
-+++ b/contrib/prip/vpyr/CMakeLists.txt
-@@ -23,6 +23,7 @@ SET(vpyr_sources
- )
- 
- ADD_LIBRARY(vpyr ${vpyr_sources})
-+SET_TARGET_PROPERTIES(vpyr PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vpyr)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vpyr ${vpyr_sources})
- TARGET_LINK_LIBRARIES(vpyr vmap)
-diff --git a/contrib/rpl/rgrl/CMakeLists.txt b/contrib/rpl/rgrl/CMakeLists.txt
-index 82c9861..3b0be6e 100644
---- a/contrib/rpl/rgrl/CMakeLists.txt
-+++ b/contrib/rpl/rgrl/CMakeLists.txt
-@@ -161,6 +161,7 @@ SET( rgrl_sources
- AUX_SOURCE_DIRECTORY( Templates rgrl_sources )
- 
- ADD_LIBRARY( rgrl ${rgrl_sources} )
-+SET_TARGET_PROPERTIES(rgrl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib rgrl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rgrl ${rgrl_sources})
- TARGET_LINK_LIBRARIES( rgrl rrel rsdl vil3d vil vnl_algo vnl vbl vul)
-diff --git a/contrib/rpl/rrel/CMakeLists.txt b/contrib/rpl/rrel/CMakeLists.txt
-index 761c023..407a5b0 100644
---- a/contrib/rpl/rrel/CMakeLists.txt
-+++ b/contrib/rpl/rrel/CMakeLists.txt
-@@ -44,7 +44,7 @@ SET(rrel_sources
- AUX_SOURCE_DIRECTORY(Templates rrel_sources)
- 
- ADD_LIBRARY(rrel ${rrel_sources})
--
-+SET_TARGET_PROPERTIES(rrel PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib rrel)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rrel ${rrel_sources})
- TARGET_LINK_LIBRARIES(rrel vnl_algo vnl vgl)
-diff --git a/contrib/rpl/rsdl/CMakeLists.txt b/contrib/rpl/rsdl/CMakeLists.txt
-index 360068b..b758e19 100644
---- a/contrib/rpl/rsdl/CMakeLists.txt
-+++ b/contrib/rpl/rsdl/CMakeLists.txt
-@@ -21,6 +21,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(rsdl ${rsdl_sources})
-+SET_TARGET_PROPERTIES(rsdl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib rsdl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rsdl ${rsdl_sources})
- TARGET_LINK_LIBRARIES( rsdl vnl vbl )
-diff --git a/contrib/tbl/vepl/CMakeLists.txt b/contrib/tbl/vepl/CMakeLists.txt
-index c6fa6ec..c7efe76 100644
---- a/contrib/tbl/vepl/CMakeLists.txt
-+++ b/contrib/tbl/vepl/CMakeLists.txt
-@@ -52,6 +52,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vepl ${vepl_sources})
-+SET_TARGET_PROPERTIES(vepl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vepl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vepl ${vepl_sources})
- TARGET_LINK_LIBRARIES(vepl vipl vil ${CMAKE_THREAD_LIBS})
-diff --git a/contrib/tbl/vipl/CMakeLists.txt b/contrib/tbl/vipl/CMakeLists.txt
-index 91a8726..4ee00e7 100644
---- a/contrib/tbl/vipl/CMakeLists.txt
-+++ b/contrib/tbl/vipl/CMakeLists.txt
-@@ -77,6 +77,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vipl ${vipl_sources})
-+SET_TARGET_PROPERTIES(vipl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vipl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vipl ${vipl_sources})
- TARGET_LINK_LIBRARIES(vipl vil vil1 vnl vbl)
-diff --git a/core/vbl/CMakeLists.txt b/core/vbl/CMakeLists.txt
-index 7298356..5c9f57b 100644
---- a/core/vbl/CMakeLists.txt
-+++ b/core/vbl/CMakeLists.txt
-@@ -42,6 +42,7 @@ SET( vbl_sources
- AUX_SOURCE_DIRECTORY(Templates vbl_sources)
- 
- ADD_LIBRARY(vbl ${vbl_sources})
-+SET_TARGET_PROPERTIES(vbl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vbl vcl )
- 
- INSTALL_TARGETS(/lib vbl)
-diff --git a/core/vbl/io/CMakeLists.txt b/core/vbl/io/CMakeLists.txt
-index f79b9f8..8ec5629 100644
---- a/core/vbl/io/CMakeLists.txt
-+++ b/core/vbl/io/CMakeLists.txt
-@@ -17,6 +17,7 @@ SET(vbl_io_sources
- AUX_SOURCE_DIRECTORY(Templates vbl_io_sources)
- 
- ADD_LIBRARY(vbl_io ${vbl_io_sources})
-+SET_TARGET_PROPERTIES(vbl_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vbl_io vbl vsl )
- 
- INSTALL_TARGETS(/lib vbl_io)
-diff --git a/core/vcsl/CMakeLists.txt b/core/vcsl/CMakeLists.txt
-index f7e8894..49191e6 100644
---- a/core/vcsl/CMakeLists.txt
-+++ b/core/vcsl/CMakeLists.txt
-@@ -63,6 +63,7 @@ doxygen_add_library(core/vcsl
-   AUX_SOURCE_DIRECTORY( Templates vcsl_sources )
- 
-   ADD_LIBRARY( vcsl ${vcsl_sources} )
-+  SET_TARGET_PROPERTIES(vcsl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
-   TARGET_LINK_LIBRARIES( vcsl vnl vbl )
- 
-   INSTALL_TARGETS(/lib vcsl)
-diff --git a/core/vgl/CMakeLists.txt b/core/vgl/CMakeLists.txt
-index 486fe81..0f22323 100644
---- a/core/vgl/CMakeLists.txt
-+++ b/core/vgl/CMakeLists.txt
-@@ -69,6 +69,7 @@ ENDIF( BUILD_NONCOMMERCIAL )
- AUX_SOURCE_DIRECTORY(Templates vgl_sources)
- 
- ADD_LIBRARY(vgl ${vgl_sources})
-+SET_TARGET_PROPERTIES(vgl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vgl vcl )
- doxygen_add_library(core/vgl
-   #DEPENDS core/vsl core/vnl
-diff --git a/core/vgl/algo/CMakeLists.txt b/core/vgl/algo/CMakeLists.txt
-index f124a5c..5cd991f 100644
---- a/core/vgl/algo/CMakeLists.txt
-+++ b/core/vgl/algo/CMakeLists.txt
-@@ -44,6 +44,7 @@ SET( vgl_algo_sources
- AUX_SOURCE_DIRECTORY(Templates vgl_algo_sources)
- 
- ADD_LIBRARY(vgl_algo ${vgl_algo_sources})
-+SET_TARGET_PROPERTIES(vgl_algo PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vgl_algo vgl vnl_algo vnl )
- 
- INSTALL_TARGETS(/lib vgl_algo)
-diff --git a/core/vgl/io/CMakeLists.txt b/core/vgl/io/CMakeLists.txt
-index bf27abc..10a6420 100644
---- a/core/vgl/io/CMakeLists.txt
-+++ b/core/vgl/io/CMakeLists.txt
-@@ -29,6 +29,7 @@ SET(vgl_io_sources
- AUX_SOURCE_DIRECTORY(Templates vgl_io_sources)
- 
- ADD_LIBRARY(vgl_io ${vgl_io_sources})
-+SET_TARGET_PROPERTIES(vgl_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vgl_io vgl vsl )
- 
- INSTALL_TARGETS(/lib vgl_io)
-diff --git a/core/vgl/xio/CMakeLists.txt b/core/vgl/xio/CMakeLists.txt
-index 365fbef..83989e4 100644
---- a/core/vgl/xio/CMakeLists.txt
-+++ b/core/vgl/xio/CMakeLists.txt
-@@ -10,6 +10,7 @@ SET(vgl_xio_sources
- AUX_SOURCE_DIRECTORY(Templates vgl_xio_sources)
- 
- ADD_LIBRARY(vgl_xio ${vgl_xio_sources})
-+SET_TARGET_PROPERTIES(vgl_xio PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- IF(NOT WIN32)
-   SET_TARGET_PROPERTIES(vgl_xio PROPERTIES COMPILE_FLAGS "-fPIC")
- ENDIF(NOT WIN32)
-diff --git a/core/vidl/CMakeLists.txt b/core/vidl/CMakeLists.txt
-index 1778ca7..eb3dcf1 100644
---- a/core/vidl/CMakeLists.txt
-+++ b/core/vidl/CMakeLists.txt
-@@ -128,6 +128,7 @@ ENDIF(VIDEODEV2_FOUND)
- AUX_SOURCE_DIRECTORY(Templates vidl_sources)
- 
- ADD_LIBRARY(vidl ${vidl_sources})
-+SET_TARGET_PROPERTIES(vidl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vidl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl ${vidl_sources})
- 
-diff --git a/core/vil/io/CMakeLists.txt b/core/vil/io/CMakeLists.txt
-index 4b9800f..b6153d8 100644
---- a/core/vil/io/CMakeLists.txt
-+++ b/core/vil/io/CMakeLists.txt
-@@ -15,6 +15,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vil_io ${vil_io_sources})
-+SET_TARGET_PROPERTIES(vil_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vil_io vil vsl )
- 
- INSTALL_TARGETS(/lib vil_io)
-diff --git a/core/vil1/CMakeLists.txt b/core/vil1/CMakeLists.txt
-index 2bde8ff..cd0797f 100644
---- a/core/vil1/CMakeLists.txt
-+++ b/core/vil1/CMakeLists.txt
-@@ -169,6 +169,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vil1 ${vil1_sources})
-+SET_TARGET_PROPERTIES(vil1 PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vil1)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1 ${vil1_sources})
- 
-diff --git a/core/vil1/io/CMakeLists.txt b/core/vil1/io/CMakeLists.txt
-index c16238a..836bb67 100644
---- a/core/vil1/io/CMakeLists.txt
-+++ b/core/vil1/io/CMakeLists.txt
-@@ -15,6 +15,7 @@ SET(vil1_io_sources
- AUX_SOURCE_DIRECTORY(Templates vil1_io_sources)
- 
- ADD_LIBRARY(vil1_io ${vil1_io_sources})
-+SET_TARGET_PROPERTIES(vil1_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vil1_io vil1 vsl )
- INSTALL_TARGETS(/lib vil1_io)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1/io ${vil1_io_sources})
-diff --git a/core/vnl/io/CMakeLists.txt b/core/vnl/io/CMakeLists.txt
-index 74da98e..3a723c6 100644
---- a/core/vnl/io/CMakeLists.txt
-+++ b/core/vnl/io/CMakeLists.txt
-@@ -26,6 +26,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vnl_io ${vnl_io_sources} )
-+SET_TARGET_PROPERTIES(vnl_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vnl_io vnl vsl )
- 
- INSTALL_TARGETS(/lib vnl_io)
-diff --git a/core/vnl/xio/CMakeLists.txt b/core/vnl/xio/CMakeLists.txt
-index b27f519..4b62d4a 100644
---- a/core/vnl/xio/CMakeLists.txt
-+++ b/core/vnl/xio/CMakeLists.txt
-@@ -11,6 +11,7 @@ SET(vnl_xio_sources
- AUX_SOURCE_DIRECTORY(Templates vnl_xio_sources)
- 
- ADD_LIBRARY(vnl_xio ${vnl_xio_sources} )
-+SET_TARGET_PROPERTIES(vnl_xio PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vnl_xio vnl vsl )
- 
- INSTALL_TARGETS(/lib vnl_xio)
-diff --git a/core/vpl/CMakeLists.txt b/core/vpl/CMakeLists.txt
-index 4c0fdfe..f2bd994 100644
---- a/core/vpl/CMakeLists.txt
-+++ b/core/vpl/CMakeLists.txt
-@@ -13,6 +13,7 @@ SET( vpl_sources
- )
- 
- ADD_LIBRARY(vpl ${vpl_sources})
-+SET_TARGET_PROPERTIES(vpl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- IF(NOT WIN32)
-   SET_TARGET_PROPERTIES(vpl PROPERTIES COMPILE_FLAGS "-fPIC")
- ENDIF(NOT WIN32)
-diff --git a/core/vsl/CMakeLists.txt b/core/vsl/CMakeLists.txt
-index 7823022..e12ddd0 100644
---- a/core/vsl/CMakeLists.txt
-+++ b/core/vsl/CMakeLists.txt
-@@ -36,6 +36,7 @@ SET(vsl_sources
- AUX_SOURCE_DIRECTORY(Templates vsl_sources)
- 
- ADD_LIBRARY(vsl ${vsl_sources})
-+SET_TARGET_PROPERTIES(vsl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vsl vcl )
- 
- INSTALL_TARGETS(/lib vsl)
-diff --git a/core/vul/CMakeLists.txt b/core/vul/CMakeLists.txt
-index f444d6a..ecacb58 100644
---- a/core/vul/CMakeLists.txt
-+++ b/core/vul/CMakeLists.txt
-@@ -76,6 +76,7 @@ ENDIF (SOLARIS)
- 
- ENDIF(APPLE)
- 
-+SET_TARGET_PROPERTIES(vul PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vul vcl )
- 
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vul 
-diff --git a/core/vul/io/CMakeLists.txt b/core/vul/io/CMakeLists.txt
-index e52099e..ee4ff9d 100644
---- a/core/vul/io/CMakeLists.txt
-+++ b/core/vul/io/CMakeLists.txt
-@@ -5,6 +5,7 @@ SET(vul_io_sources
- )
- 
- ADD_LIBRARY(vul_io ${vul_io_sources})
-+SET_TARGET_PROPERTIES(vul_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(vul_io vul vsl)
- 
- INSTALL_TARGETS(/lib vul_io)
--- 
-1.7.11.7
-

0009-Bumped-up-version-to-1.14.patch

@@ -1,26 +0,0 @@
-From 75b02abb0f8c4826c0bf435422b5d659057f664a Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:39:14 +0200
-Subject: [PATCH 09/23] Bumped up version to 1.14
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 71f48bc..c532b01 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,7 +13,7 @@ ENDIF( COMMAND CMAKE_POLICY )
- PROJECT(vxl)
- 
- SET(VXL_MAJOR_VERSION 1)
--SET(VXL_MINOR_VERSION 13)
-+SET(VXL_MINOR_VERSION 14)
- SET(VXL_BUILD_VERSION 0)
- SET(VXL_VERSION
-   "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}.${VXL_BUILD_VERSION}")
--- 
-1.7.11.7
-

0009-v3.5.0-indent-to-keep-gcc-happy.patch

@@ -0,0 +1,26 @@
+From 303abcb68bcc14b04d73460d25d8e4978e5b3617 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Mon, 23 Oct 2023 13:27:34 +0100
+Subject: [PATCH 09/18] v3.5.0: indent to keep gcc happy
+
+---
+ core/vpgl/vpgl_tri_focal_tensor.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/core/vpgl/vpgl_tri_focal_tensor.h b/core/vpgl/vpgl_tri_focal_tensor.h
+index 21a96688fb..e3f8929767 100644
+--- a/core/vpgl/vpgl_tri_focal_tensor.h
++++ b/core/vpgl/vpgl_tri_focal_tensor.h
+@@ -186,7 +186,8 @@ protected:
+ 
+ 
+   virtual bool get_epipoles(vgl_homg_point_2d<Type>& e12, vgl_homg_point_2d<Type>& e13)  {
+-    if (!epipoles_valid_) compute_epipoles(); e12 = e12_; e13 = e13_; return epipoles_valid_;
++    if (!epipoles_valid_) compute_epipoles();
++    e12 = e12_; e13 = e13_; return epipoles_valid_;
+   }
+ 
+   bool compute_epipoles();
+-- 
+2.46.1
+

0010-Use-system-FindEXPAT.patch

@@ -1,26 +0,0 @@
-From 2eb77e1b65646b0f20682ce8345917b84aa73d11 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:39:33 +0200
-Subject: [PATCH 10/23] Use system FindEXPAT
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/bbas/bxml/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/brl/bbas/bxml/CMakeLists.txt b/contrib/brl/bbas/bxml/CMakeLists.txt
-index 1e15c59..f513190 100644
---- a/contrib/brl/bbas/bxml/CMakeLists.txt
-+++ b/contrib/brl/bbas/bxml/CMakeLists.txt
-@@ -12,7 +12,7 @@ SET( bxml_sources
-     bxml_find.cxx                bxml_find.h
- )
- 
--INCLUDE( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- 
- IF(EXPAT_FOUND)
-  IF(EXPATPP_FOUND)
--- 
-1.7.11.7
-

0010-v3.5.0-more-linker-fixes.patch

@@ -0,0 +1,31 @@
+From c45defc6a27e344f7d3f69dde806d4b187e2aa27 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Mon, 23 Oct 2023 15:55:38 +0100
+Subject: [PATCH 10/18] v3.5.0: more linker fixes
+
+---
+ contrib/brl/bbas/imesh/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/brl/bbas/imesh/CMakeLists.txt b/contrib/brl/bbas/imesh/CMakeLists.txt
+index b122b33faf..a8a107e574 100644
+--- a/contrib/brl/bbas/imesh/CMakeLists.txt
++++ b/contrib/brl/bbas/imesh/CMakeLists.txt
+@@ -22,11 +22,11 @@ aux_source_directory(Templates imesh_sources)
+ 
+ vxl_add_library(LIBRARY_NAME imesh LIBRARY_SOURCES  ${imesh_sources})
+ 
+-target_link_libraries(imesh ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl)
++target_link_libraries(imesh ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul brdb ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl)
+ 
+ # Algorithms
+ add_subdirectory(algo)
+ 
+ if( BUILD_TESTING )
+   add_subdirectory(tests)
+-endif()
++endif()
+\ No newline at end of file
+-- 
+2.46.1
+

0011-Do-not-use-bundled-minizip.patch

@@ -1,30 +0,0 @@
-From 2721eacfd99e884904adbef9b1fe77530bcbbe4c Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 17:39:50 +0200
-Subject: [PATCH 11/23] Do not use bundled minizip
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/b3p/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/brl/b3p/CMakeLists.txt b/contrib/brl/b3p/CMakeLists.txt
-index 7e61ffb..a0cc98e 100644
---- a/contrib/brl/b3p/CMakeLists.txt
-+++ b/contrib/brl/b3p/CMakeLists.txt
-@@ -16,10 +16,10 @@ MARK_AS_ADVANCED( VXL_FORCE_B3P_EXPAT )
- SUBDIRS(expat)
- SUBDIRS(expatpp)
- 
--OPTION( VXL_FORCE_B3P_SHAPELIB "Use B3P instead of any native SHAPELIB library?" YES)
-+OPTION( VXL_FORCE_B3P_SHAPELIB "Use B3P instead of any native SHAPELIB library?" NO)
- MARK_AS_ADVANCED( VXL_FORCE_B3P_SHAPELIB )
- SUBDIRS(shapelib)
- 
--SUBDIRS(minizip)
-+#SUBDIRS(minizip)
- 
- 
--- 
-1.7.11.7
-

0011-v3.5.0-fix-for-gcc11.patch

@@ -0,0 +1,89 @@
+From 690e4102939836f82afb83bba6120698403fcd43 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Mon, 23 Oct 2023 17:05:04 +0100
+Subject: [PATCH 11/18] v3.5.0: fix for gcc11
+
+---
+ .../brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx    | 1 +
+ contrib/brl/bseg/bsgm/bsgm_error_checking.h                      | 1 +
+ contrib/brl/bseg/bsgm/bsgm_remove_spikes.h                       | 1 +
+ contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h               | 1 +
+ core/testlib/testlib_test.h                                      | 1 +
+ core/vnl/vnl_bignum.cxx                                          | 1 +
+ 6 files changed, 6 insertions(+)
+
+diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx
+index 67f6f1582c..185042f4df 100644
+--- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx
++++ b/contrib/brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx
+@@ -2,6 +2,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <algorithm>
++#include <limits>
+ #include <bprb/bprb_func_process.h>
+ //:
+ // \file
+diff --git a/contrib/brl/bseg/bsgm/bsgm_error_checking.h b/contrib/brl/bseg/bsgm/bsgm_error_checking.h
+index 3eb3731a48..69ddb9a659 100644
+--- a/contrib/brl/bseg/bsgm/bsgm_error_checking.h
++++ b/contrib/brl/bseg/bsgm/bsgm_error_checking.h
+@@ -11,6 +11,7 @@
+ #include <vgl/vgl_box_2d.h>
+ #include <vil/vil_image_view.h>
+ #include <vector>
++#include <limits>
+ 
+ //:
+ // \file
+diff --git a/contrib/brl/bseg/bsgm/bsgm_remove_spikes.h b/contrib/brl/bseg/bsgm/bsgm_remove_spikes.h
+index fd1ca2a941..c20cfe8b80 100644
+--- a/contrib/brl/bseg/bsgm/bsgm_remove_spikes.h
++++ b/contrib/brl/bseg/bsgm/bsgm_remove_spikes.h
+@@ -2,6 +2,7 @@
+ #include <iomanip>
+ #include <cmath>
+ #include <vector>
++#include <limits>
+ #include <vgl/vgl_point_3d.h>
+ #include <vil/vil_image_view.h>
+ 
+diff --git a/contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h b/contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h
+index 96654ddac0..762d4598bf 100644
+--- a/contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h
++++ b/contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h
+@@ -10,6 +10,7 @@
+ #include <vil3d/vil3d_math.h>
+ #include <vil3d/algo/vil3d_exp_filter.h>
+ #include <cassert>
++#include <limits>
+ #ifdef _MSC_VER
+ #  include <vcl_msvc_warnings.h>
+ #endif
+diff --git a/core/testlib/testlib_test.h b/core/testlib/testlib_test.h
+index e070f2aacc..87d5c5ceb1 100644
+--- a/core/testlib/testlib_test.h
++++ b/core/testlib/testlib_test.h
+@@ -14,6 +14,7 @@
+ 
+ #include <string>
+ #include <complex>
++#include <limits>
+ 
+ //: initialise test counters, check test name 'name' exists
+ void testlib_test_start(const char* name = nullptr);
+diff --git a/core/vnl/vnl_bignum.cxx b/core/vnl/vnl_bignum.cxx
+index 26760c2054..0556918395 100644
+--- a/core/vnl/vnl_bignum.cxx
++++ b/core/vnl/vnl_bignum.cxx
+@@ -6,6 +6,7 @@
+ #include <algorithm>
+ #include <vector>
+ #include <iostream>
++#include <limits>
+ #include "vnl_bignum.h"
+ //:
+ // \file
+-- 
+2.46.1
+

0012-Added-Coin3D-Submitted-by-Volker-Frohlich.patch

@@ -1,32 +0,0 @@
-From 9cbbbb7fcd8474be298169603f94401efa060806 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 18:51:01 +0200
-Subject: [PATCH 12/23] Added Coin3D (Submitted by Volker Frohlich)
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- config/cmake/Modules/NewCMake/FindCoin3D.cmake | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/config/cmake/Modules/NewCMake/FindCoin3D.cmake b/config/cmake/Modules/NewCMake/FindCoin3D.cmake
-index 800e578..39407a1 100644
---- a/config/cmake/Modules/NewCMake/FindCoin3D.cmake
-+++ b/config/cmake/Modules/NewCMake/FindCoin3D.cmake
-@@ -57,7 +57,7 @@ ELSE (WIN32)
-     SET(COIN3D_LIBRARY "-framework Coin3d" CACHE STRING "Coin3D library for OSX")
-    ELSE(APPLE)
- 
--  FIND_PATH(COIN3D_INCLUDE_DIR Inventor/So.h)
-+    FIND_PATH(COIN3D_INCLUDE_DIR Coin2/Inventor/So.h)
- 
-   FIND_LIBRARY(COIN3D_LIBRARY Coin)   
-   ENDIF(APPLE)
-@@ -70,5 +70,3 @@ INCLUDE(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Coin3D DEFAULT_MSG COIN3D_LIBRARY COIN3D_INCLUDE_DIR)
- 
- MARK_AS_ADVANCED(COIN3D_INCLUDE_DIR COIN3D_LIBRARY )
--
--
--- 
-1.7.11.7
-

0012-v3.5.0-link-against-acal.patch

@@ -0,0 +1,45 @@
+From 0cee9d18cd8a652145684ac0c74d905b810e5e0c Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Tue, 24 Oct 2023 12:16:41 +0100
+Subject: [PATCH 12/18] v3.5.0: link against acal
+
+To fix:
+```
+/usr/bin/ld: ../../../../../lib/libbsgm.so.3.5.0.0: undefined reference to `acal_f_utils::read_affine_cameras(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::map<unsigned long, vpgl_affine_camera<double>, std::less<unsigned long>, std::allocator<std::pair<unsigned long const, vpgl_affine_camera<double> > > >&)'
+/usr/bin/ld: ../../../../../lib/libbsgm.so.3.5.0.0: undefined reference to `acal_f_utils::datetime_from_iname(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, dtime&)'
+/usr/bin/ld: ../../../../../lib/libbsgm.so.3.5.0.0: undefined reference to `dtime::time_diff(dtime const&, dtime const&)'
+collect2: error: ld returned 1 exit status
+```
+---
+ contrib/brl/bseg/bsgm/CMakeLists.txt         | 2 +-
+ contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/brl/bseg/bsgm/CMakeLists.txt b/contrib/brl/bseg/bsgm/CMakeLists.txt
+index 44c4637af2..975ed5364c 100644
+--- a/contrib/brl/bseg/bsgm/CMakeLists.txt
++++ b/contrib/brl/bseg/bsgm/CMakeLists.txt
+@@ -16,7 +16,7 @@ aux_source_directory(Templates bsgm_sources)
+ 
+ vxl_add_library(LIBRARY_NAME bsgm LIBRARY_SOURCES ${bsgm_sources})
+ 
+-target_link_libraries( bsgm vidl_pro ${VXL_LIB_PREFIX}bpgl_algo ${VXL_LIB_PREFIX}brip ${VXL_LIB_PREFIX}bsta ${VXL_LIB_PREFIX}bjson ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
++target_link_libraries( bsgm vidl_pro ${VXL_LIB_PREFIX}acal ${VXL_LIB_PREFIX}bpgl_algo ${VXL_LIB_PREFIX}brip ${VXL_LIB_PREFIX}bsta ${VXL_LIB_PREFIX}bjson ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
+ 
+ add_subdirectory( app )
+ 
+diff --git a/contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx b/contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx
+index 6320d290ff..e97e318428 100644
+--- a/contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx
++++ b/contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx
+@@ -4,6 +4,7 @@
+ #include <algorithm>
+ #include <fstream>
+ #include <bpgl/acal/acal_metadata.h>
++#include <bpgl/acal/acal_f_utils.h>
+ 
+ std::string bsgm_pair_selector::remove_crop_postfix(std::string const& iname)
+ {
+-- 
+2.46.1
+

0013-Added-SIMVoleon-Submitted-by-Volker-Frohlich.patch

@@ -1,31 +0,0 @@
-From 03679cdfb3253e9cdae7513c0c0e7e44e5beb641 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 18:51:36 +0200
-Subject: [PATCH 13/23] Added SIMVoleon (Submitted by Volker Frohlich)
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- config/cmake/Modules/NewCMake/FindSIMVoleon.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/config/cmake/Modules/NewCMake/FindSIMVoleon.cmake b/config/cmake/Modules/NewCMake/FindSIMVoleon.cmake
-index c4658eb..f4f81d4 100644
---- a/config/cmake/Modules/NewCMake/FindSIMVoleon.cmake
-+++ b/config/cmake/Modules/NewCMake/FindSIMVoleon.cmake
-@@ -54,11 +54,13 @@ IF(COIN3D_FOUND)
- 
-       FIND_PATH(SIMVOLEON_INCLUDE_DIR VolumeViz/nodes/SoVolumeRender.h
-         /usr/include
-+        /usr/include/Coin2
-         /usr/local/include
-       )
- 
-       FIND_LIBRARY(SIMVOLEON_LIBRARY SimVoleon
-         /usr/lib
-+        /usr/lib64
-         /usr/local/lib
-       )   
- 
--- 
-1.7.11.7
-

0013-v3.5.0-more-linkage-fixes.patch

@@ -0,0 +1,25 @@
+From 2757969a8b0e55c2310d50ef4764d3f81ce1d748 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Tue, 24 Oct 2023 13:50:37 +0100
+Subject: [PATCH 13/18] v3.5.0: more linkage fixes
+
+---
+ contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt b/contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt
+index 66d543b5c9..0ffff761fd 100644
+--- a/contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt
++++ b/contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt
+@@ -8,7 +8,7 @@ if(EXPAT_FOUND)
+   test_vil_crop_image_process.cxx
+  )
+ 
+-target_link_libraries(vil_pro_test_all ${VXL_LIB_PREFIX}testlib vil_pro bprb sdet ${VXL_LIB_PREFIX}vil expat expatpp)
++target_link_libraries(vil_pro_test_all ${VXL_LIB_PREFIX}testlib vil_pro bprb brdb sdet ${VXL_LIB_PREFIX}vil expat expatpp)
+ 
+ add_test( NAME bpro_vil_test_convert_to_n_planes_process COMMAND $<TARGET_FILE:vil_pro_test_all> test_vil_convert_to_n_planes_process )
+ add_test( NAME bpro_vil_test_crop_image_process COMMAND $<TARGET_FILE:vil_pro_test_all> test_vil_crop_image_process )
+-- 
+2.46.1
+

0014-Added-additional-search-path-for-xerces-Submitted-by.patch

@@ -1,40 +0,0 @@
-From 93f8c6e6fbd727769b436aa0e92dae9ca7f16be1 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 18:52:07 +0200
-Subject: [PATCH 14/23] Added additional search path for xerces (Submitted by
- Volker Frohlich)
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/brl/bmods/find_xerces.cmake | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/contrib/brl/bmods/find_xerces.cmake b/contrib/brl/bmods/find_xerces.cmake
-index e3a65f7..97290cb 100644
---- a/contrib/brl/bmods/find_xerces.cmake
-+++ b/contrib/brl/bmods/find_xerces.cmake
-@@ -8,6 +8,7 @@
- FIND_PATH(XERCES_BXML_INCLUDE_PATH dom/DOM.hpp
-           ${vxl_SOURCE_DIR}/../xerces-c-src1_4_0/include
-           /usr/local/xerces-c-src1_4_0/include
-+          /usr/include/xercesc
-           ${vxl_SOURCE_DIR}/v3p/xerces-c-src1_4_0/include
- )
- 
-@@ -29,10 +30,13 @@ ENDIF(XERCES_BXML_INCLUDE_PATH)
- 
- # this line used for transit phase
- FIND_PATH(XERCES_NEW_BXML_INCLUDE_PATH xercesc/dom/Dom.hpp
-+          /usr/include
-           ${vxl_SOURCE_DIR}/../xerces-c2_2_0/include
- )
- 
- FIND_LIBRARY(XERCES_NEW_BXML_LIBRARY_PATH xerces-c_2
-+          /usr/lib
-+          /usr/lib64
-           ${vxl_SOURCE_DIR}/../xerces-c2_2_0/lib
-           ${vxl_BINARY_DIR}/v3p/lib
- )
--- 
-1.7.11.7
-

0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch

@@ -0,0 +1,52 @@
+From ea6a4cc7095db5e98728849f6db505952704ca37 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Mon, 22 Jan 2024 11:40:35 +0000
+Subject: [PATCH 14/18] v3.5.0: use system zlib, tiff, minizip-compat
+
+---
+ contrib/brl/bseg/bmdl/CMakeLists.txt     | 7 +++++++
+ contrib/brl/bseg/bmdl/pro/CMakeLists.txt | 4 ++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/brl/bseg/bmdl/CMakeLists.txt b/contrib/brl/bseg/bmdl/CMakeLists.txt
+index 4890d2ab29..8db0d2ca1c 100644
+--- a/contrib/brl/bseg/bmdl/CMakeLists.txt
++++ b/contrib/brl/bseg/bmdl/CMakeLists.txt
+@@ -1,5 +1,12 @@
+ # This is brl/seg/bmdl/CMakeLists.txt
+ 
++FIND_PACKAGE( ZLIB QUIET )
++if(ZLIB_FOUND)
++  include_directories( ${ZLIB_INCLUDE_DIR} )
++  include_directories( ${BRL_INCLUDE_DIR}/b3p )
++  add_definitions(-DHAS_ZLIB=1)
++endif()
++
+ if(HAS_GEOTIFF)
+   include_directories( ${GEOTIFF_INCLUDE_DIR} )
+ 
+diff --git a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+index 7c73fe1bb0..cc30626c09 100644
+--- a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # This is contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+ # bmdl's Process Library
+ 
+-include( ${VXL_CMAKE_DIR}/FindZLIB.cmake )
++FIND_PACKAGE( ZLIB QUIET )
+ if(ZLIB_FOUND)
+   include_directories( ${ZLIB_INCLUDE_DIR} )
+   include_directories( ${BRL_INCLUDE_DIR}/b3p )
+@@ -12,7 +12,7 @@ endif()
+ FIND_PACKAGE(EXPAT REQUIRED)
+ FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+-  include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
++  FIND_PACKAGE(TIFF)
+   if(TIFF_FOUND)
+     include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
+     if(GEOTIFF_FOUND)
+-- 
+2.46.1
+

0015-Manage-KL-library-Submitted-by-Volker-Frohlich.patch

@@ -1,85 +0,0 @@
-From f5f4f002e47ce541d8020cd2ae3203bf1b08b9f7 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 18:54:20 +0200
-Subject: [PATCH 15/23] Manage KL library (Submitted by Volker Frohlich)
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/gel/CMakeLists.txt         |  2 ++
- contrib/gel/vgel/kl/CMakeLists.txt | 46 ++++++++++++++++++++++----------------
- 2 files changed, 29 insertions(+), 19 deletions(-)
-
-diff --git a/contrib/gel/CMakeLists.txt b/contrib/gel/CMakeLists.txt
-index d9284db..d605337 100644
---- a/contrib/gel/CMakeLists.txt
-+++ b/contrib/gel/CMakeLists.txt
-@@ -4,6 +4,8 @@ PROJECT( gel )
- 
- doxygen_add_package(contrib/gel "GE Libraries")
- 
-+SET( GEL_MODULE_PATH ${vxl_SOURCE_DIR}/contrib/gel/gelmods )
-+
- SET( GEL_INCLUDE_DIR ${gel_SOURCE_DIR} CACHE STATIC "GE package include files" )
- SET( GEL_INSTALL_INCLUDE_DIR 
-   ${CMAKE_INSTALL_PREFIX}/include/vxl/contrib/gel
-diff --git a/contrib/gel/vgel/kl/CMakeLists.txt b/contrib/gel/vgel/kl/CMakeLists.txt
-index bbb86ed..986fe44 100644
---- a/contrib/gel/vgel/kl/CMakeLists.txt
-+++ b/contrib/gel/vgel/kl/CMakeLists.txt
-@@ -1,26 +1,34 @@
- # gel/vgel/kl/CMakeLists.txt
- 
--SET(vgel_kl_sources
--                      base.h
-- convolve.c           convolve.h
-- klt.c                klt.h
-- pnmio.c              pnmio.h
-- selectGoodFeatures.c
-- trackFeatures.c
-- error.c              error.h
-- klt_util.c           klt_util.h
-- pyramid.c            pyramid.h
-- storeFeatures.c
-- writeFeatures.c
--)
-+INCLUDE(${MODULE_PATH}/FindKL.cmake)
- 
--ADD_LIBRARY(vgel_kl ${vgel_kl_sources})
--INSTALL_TARGETS(/lib vgel_kl)
--INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vgel/kl ${vgel_kl_sources})
-+IF(NOT VXL_USING_NATIVE_KL)
-+    INCLUDE(${GEL_MODULE_PATH}/FindKL.cmake)
- 
--IF(UNIX)
--  TARGET_LINK_LIBRARIES(vgel_kl m)
--ENDIF(UNIX)
-+    INCLUDE_DIRECTORIES(${KL_INCLUDE_DIR})
-+
-+    SET( vgel_kl_sources
-+                          base.h
-+     convolve.c           convolve.h
-+     klt.c                klt.h
-+     pnmio.c              pnmio.h
-+     selectGoodFeatures.c
-+     trackFeatures.c
-+     error.c              error.h
-+     klt_util.c           klt_util.h
-+     pyramid.c            pyramid.h
-+     storeFeatures.c
-+     writeFeatures.c
-+    )
-+
-+    ADD_LIBRARY(vgel_kl ${vgel_kl_sources})
-+    INSTALL_TARGETS(/lib vgel_kl)
-+    INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vgel/kl ${vgel_kl_sources})
-+
-+    IF(UNIX)
-+      TARGET_LINK_LIBRARIES(vgel_kl m)
-+    ENDIF(UNIX)
-+ENDIF(NOT VXL_USING_NATIVE_KL)
- 
- IF( BUILD_TESTING )
-   SUBDIRS(tests)
--- 
-1.7.11.7
-

0015-v3.5.0-fix-linking.patch

@@ -0,0 +1,25 @@
+From 4f74f5343ff3595872d045c4bf5025e347d18438 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Tue, 23 Jan 2024 16:54:51 +0000
+Subject: [PATCH 15/18] v3.5.0: fix linking
+
+---
+ contrib/brl/bpro/core/brip_pro/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/brl/bpro/core/brip_pro/CMakeLists.txt b/contrib/brl/bpro/core/brip_pro/CMakeLists.txt
+index cfa7d46af8..b8d557cdb9 100644
+--- a/contrib/brl/bpro/core/brip_pro/CMakeLists.txt
++++ b/contrib/brl/bpro/core/brip_pro/CMakeLists.txt
+@@ -14,7 +14,7 @@ aux_source_directory(Templates brip_pro_sources)
+ aux_source_directory(processes brip_pro_sources)
+ 
+ vxl_add_library(LIBRARY_NAME brip_pro LIBRARY_SOURCES ${brip_pro_sources})
+-target_link_libraries(brip_pro bprb brdb brip vil_pro ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vsl bil_algo)
++target_link_libraries(brip_pro bprb brdb brip vpgl_pro vil_pro ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vsl bil_algo)
+ 
+ if( BUILD_TESTING )
+   add_subdirectory(tests)
+-- 
+2.46.1
+

0016-Manage-KL-library-2-2-Submitted-by-Volker-Frohlich.patch

@@ -1,107 +0,0 @@
-From b2b3a2da18579c9f6cc6849eded94fd57aadadc2 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Wed, 10 Oct 2012 18:55:13 +0200
-Subject: [PATCH 16/23] Manage KL library 2/2 (Submitted by Volker Frohlich)
-
-Signed-off-by: Mario Ceresa <mrceresa@gmail.com>
----
- contrib/gel/gelmods/FindKL.cmake  | 30 ++++++++++++++++++++++++
- contrib/gel/gelmods/FindKL2.cmake | 49 +++++++++++++++++++++++++++++++++++++++
- 2 files changed, 79 insertions(+)
- create mode 100644 contrib/gel/gelmods/FindKL.cmake
- create mode 100644 contrib/gel/gelmods/FindKL2.cmake
-
-diff --git a/contrib/gel/gelmods/FindKL.cmake b/contrib/gel/gelmods/FindKL.cmake
-new file mode 100644
-index 0000000..e79e485
---- /dev/null
-+++ b/contrib/gel/gelmods/FindKL.cmake
-@@ -0,0 +1,30 @@
-+# - Find KL library
-+# Find the native KL includes and library
-+# This module defines
-+#  KL_INCLUDE_DIR, where to find klt.h, etc.
-+#  KL_LIBRARIES, libraries to link against to use KL.
-+#  KL_FOUND, If false, do not try to use KL.
-+# also defined, but not for general use are
-+#  KL_LIBRARY, where to find the KL library.
-+
-+FIND_PATH( KL_INCLUDE_DIR klt.h
-+  /usr/include
-+  /usr/include/klt
-+  /usr/local/include
-+)
-+
-+SET( KL_NAMES ${KL_NAMES} klt )
-+FIND_LIBRARY( KL_LIBRARY
-+  NAMES ${KL_NAMES}
-+  PATHS /usr/lib
-+    /usr/lib64
-+    /usr/local/lib
-+)
-+
-+SET( KL_FOUND "NO" )
-+IF( KL_INCLUDE_DIR )
-+    IF( KL_LIBRARY )
-+        SET( KL_FOUND "YES" )
-+        SET( KL_LIBRARIES ${KL_LIBRARY} )
-+    ENDIF( KL_LIBRARY )
-+ENDIF( KL_INCLUDE_DIR )
-diff --git a/contrib/gel/gelmods/FindKL2.cmake b/contrib/gel/gelmods/FindKL2.cmake
-new file mode 100644
-index 0000000..daffa59
---- /dev/null
-+++ b/contrib/gel/gelmods/FindKL2.cmake
-@@ -0,0 +1,49 @@
-+#
-+# Find a KL library
-+#
-+# This file is used to manage using either a natively provided KL library or the one in v3p if provided.
-+#
-+#
-+# As per the standard scheme the following definitions are used
-+# KL_INCLUDE_DIR - where to find geotiff.h
-+# KL_LIBRARIES   - the set of libraries to include to use KL.
-+# KL_FOUND       - TRUE, if available somewhere on the system.
-+
-+# Additionally
-+# VXL_USING_NATIVE_KL  - True if we are using a KL library provided outside vxl (or v3p)
-+
-+
-+# If this FORCE variable is unset or is FALSE, try to find a native library.
-+IF( VXL_FORCE_V3P_KL )
-+ELSE( VXL_FORCE_V3P_KL )
-+  INCLUDE( ${MODULE_PATH}/NewCMake/FindKL.cmake )
-+ENDIF( VXL_FORCE_V3P_KL )
-+
-+  
-+IF(KL_FOUND)
-+
-+  SET(VXL_USING_NATIVE_KL "YES")
-+
-+ELSE(KL_FOUND)
-+
-+  #
-+  # At some point, in a "release" version, it is possible that someone
-+  # will not have the v3p geotiff library, so make sure the headers
-+  # exist.
-+  #
-+  
-+  IF(EXISTS ${vxl_SOURCE_DIR}/contrib/gel/vgel/kl/klt.h)
-+    # Use FIND_PATH here to allow the user to set the path to IGNORE
-+    # to disable geotiff support.
-+    FIND_PATH(KL_INCLUDE_DIR klt.h
-+      ${vxl_SOURCE_DIR}/v3p/geotiff
-+    )
-+    IF( KL_INCLUDE_DIR )
-+      SET( KL_FOUND "YES" )
-+      SET( KL_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_DIR}/include/vxl/v3p/geotiff)
-+      SET( KL_LIBRARIES geotiff )
-+    ENDIF( KL_INCLUDE_DIR )
-+  
-+  ENDIF(EXISTS ${vxl_SOURCE_DIR}/v3p/geotiff/geotiff.h)
-+  
-+ENDIF(KL_FOUND)
--- 
-1.7.11.7
-

0016-v3.5.0-fix-linking.patch

@@ -0,0 +1,26 @@
+From 4de179f888a8c0ce9bbec7a63c4e86015598a809 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Tue, 1 Oct 2024 16:00:35 +0100
+Subject: [PATCH 16/18] v3.5.0: fix linking
+
+---
+ contrib/brl/bpro/core/vil_pro/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/brl/bpro/core/vil_pro/CMakeLists.txt b/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
+index 5298c63727..ba36c765bb 100644
+--- a/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
++++ b/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
+@@ -17,7 +17,8 @@ aux_source_directory(processes vil_pro_sources)
+ 
+ vxl_add_library(LIBRARY_NAME vil_pro LIBRARY_SOURCES ${vil_pro_sources})
+ 
+-target_link_libraries(vil_pro bbas_pro bprb bil bil_algo brip sdet ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vsl bsta_vis)
++target_link_libraries(vil_pro bbas_pro bprb bil bil_algo brip sdet ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vsl bsta_vis vpgl_pro)
++# Need vpgl_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<vpgl_camera<double> > >
+ 
+ if( BUILD_TESTING )
+   add_subdirectory(tests)
+-- 
+2.46.1
+

0017-Add-sonames-to-vpgl-lib.patch

@@ -1,77 +0,0 @@
-From b23d58cbe99dd3bda8468a83e59ca0c18a38150d Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Sun, 14 Oct 2012 17:11:31 +0200
-Subject: [PATCH 17/23] Add sonames to vpgl lib
-
----
- core/vpgl/CMakeLists.txt              | 1 +
- core/vpgl/algo/CMakeLists.txt         | 1 +
- core/vpgl/file_formats/CMakeLists.txt | 2 +-
- core/vpgl/io/CMakeLists.txt           | 1 +
- core/vpgl/xio/CMakeLists.txt          | 1 +
- 5 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/core/vpgl/CMakeLists.txt b/core/vpgl/CMakeLists.txt
-index 235853f..120eebb 100755
---- a/core/vpgl/CMakeLists.txt
-+++ b/core/vpgl/CMakeLists.txt
-@@ -32,6 +32,7 @@ SET( vpgl_sources
- AUX_SOURCE_DIRECTORY(Templates vpgl_sources)
- 
- ADD_LIBRARY(vpgl ${vpgl_sources})
-+SET_TARGET_PROPERTIES(vpgl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(vpgl vnl_algo vnl vgl_algo vgl vul vsl vbl)
- 
- IF( BUILD_TESTING )
-diff --git a/core/vpgl/algo/CMakeLists.txt b/core/vpgl/algo/CMakeLists.txt
-index 753efb8..7dfdb9e 100755
---- a/core/vpgl/algo/CMakeLists.txt
-+++ b/core/vpgl/algo/CMakeLists.txt
-@@ -29,6 +29,7 @@ SET( vpgl_algo_sources
- AUX_SOURCE_DIRECTORY(Templates vpgl_algo_sources)
- 
- ADD_LIBRARY(vpgl_algo ${vpgl_algo_sources})
-+SET_TARGET_PROPERTIES(vpgl_algo PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- 
- TARGET_LINK_LIBRARIES(vpgl_algo vpgl vpgl_file_formats vgl_algo vnl_algo vnl vgl vil vul vbl)
- 
-diff --git a/core/vpgl/file_formats/CMakeLists.txt b/core/vpgl/file_formats/CMakeLists.txt
-index d5c38f9..e864476 100755
---- a/core/vpgl/file_formats/CMakeLists.txt
-+++ b/core/vpgl/file_formats/CMakeLists.txt
-@@ -21,7 +21,7 @@ IF(TIFF_FOUND)
- ENDIF(TIFF_FOUND)
- 
- ADD_LIBRARY(vpgl_file_formats ${vpgl_file_formats_sources})
--
-+SET_TARGET_PROPERTIES(vpgl_file_formats PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(vpgl_file_formats vpgl vil vnl)
- 
- IF( BUILD_TESTING )
-diff --git a/core/vpgl/io/CMakeLists.txt b/core/vpgl/io/CMakeLists.txt
-index 6809320..80ff3a1 100755
---- a/core/vpgl/io/CMakeLists.txt
-+++ b/core/vpgl/io/CMakeLists.txt
-@@ -13,6 +13,7 @@ SET(vpgl_io_sources
- AUX_SOURCE_DIRECTORY(Templates vpgl_io_sources)
- 
- ADD_LIBRARY(vpgl_io ${vpgl_io_sources})
-+SET_TARGET_PROPERTIES(vpgl_io PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- 
- TARGET_LINK_LIBRARIES(vpgl_io vsl vpgl vnl vgl vgl_algo vgl_io vnl_io vbl_io)
- 
-diff --git a/core/vpgl/xio/CMakeLists.txt b/core/vpgl/xio/CMakeLists.txt
-index 986ac31..a883456 100644
---- a/core/vpgl/xio/CMakeLists.txt
-+++ b/core/vpgl/xio/CMakeLists.txt
-@@ -5,6 +5,7 @@ SET(vpgl_xio_sources
- )
- 
- ADD_LIBRARY(vpgl_xio ${vpgl_xio_sources} )
-+SET_TARGET_PROPERTIES(vpgl_xio PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vpgl_xio vpgl vsl )
- 
- INSTALL_TARGETS(/lib vpgl_xio)
--- 
-1.7.11.7
-

0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch

@@ -0,0 +1,894 @@
+From a002d34fee7a0c86de360de5792dbffbbb5255d9 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Tue, 1 Oct 2024 16:26:23 +0100
+Subject: [PATCH 17/18] v3.5.0: remove boxm2 processes that use sdnet that
+ require triangle
+
+---
+ contrib/brl/bseg/boxm2/pro/boxm2_processes.h  |   3 -
+ contrib/brl/bseg/boxm2/pro/boxm2_register.cxx |   3 -
+ .../processes/boxm2_export_mesh_process.cxx   | 213 -------
+ .../boxm2_export_textured_mesh_process.cxx    | 523 ------------------
+ .../pro/processes/boxm2_load_mesh_process.cxx |  78 ---
+ 5 files changed, 820 deletions(-)
+ delete mode 100644 contrib/brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx
+ delete mode 100644 contrib/brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx
+
+diff --git a/contrib/brl/bseg/boxm2/pro/boxm2_processes.h b/contrib/brl/bseg/boxm2/pro/boxm2_processes.h
+index 4d68be95b0..7094c03fb5 100644
+--- a/contrib/brl/bseg/boxm2/pro/boxm2_processes.h
++++ b/contrib/brl/bseg/boxm2/pro/boxm2_processes.h
+@@ -13,8 +13,6 @@ DECLARE_FUNC_CONS(boxm2_create_cache_process);
+ DECLARE_FUNC_CONS(boxm2_create_scene_process);
+ DECLARE_FUNC_CONS(boxm2_write_scene_xml_process);
+ DECLARE_FUNC_CONS(boxm2_add_block_process);
+-DECLARE_FUNC_CONS(boxm2_export_textured_mesh_process);
+-DECLARE_FUNC_CONS(boxm2_export_mesh_process);
+ DECLARE_FUNC_CONS(boxm2_describe_scene_process);
+ DECLARE_FUNC_CONS(boxm2_create_stream_cache_process);
+ DECLARE_FUNC_CONS(boxm2_roi_init_process);
+@@ -57,7 +55,6 @@ DECLARE_FUNC_CONS(boxm2_label_to_xyz_process);
+ DECLARE_FUNC_CONS(boxm2_label_to_xyz_process2);
+ DECLARE_FUNC_CONS(boxm2_prune_scene_blocks_process);
+ DECLARE_FUNC_CONS(boxm2_prune_scene_blocks_by_dem_process);
+-DECLARE_FUNC_CONS(boxm2_load_mesh_process);
+ DECLARE_FUNC_CONS(boxm2_create_camera_from_kml_path_process);  // August 23, 2013 Yi Dong
+ 
+ DECLARE_FUNC_CONS(boxm2_ortho_geo_cam_from_scene_process);
+diff --git a/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx b/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx
+index a05b9e5c58..e1cefa5765 100644
+--- a/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx
++++ b/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx
+@@ -33,8 +33,6 @@ void boxm2_register::register_process()
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_create_scene_process,    "boxm2CreateSceneProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_write_scene_xml_process, "boxm2WriteSceneXMLProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_add_block_process,       "boxm2AddBlockProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_export_textured_mesh_process,"boxm2ExportTexturedMeshProcess");
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_export_mesh_process,"boxm2ExportMeshProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_describe_scene_process,"boxm2DescribeSceneProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_create_stream_cache_process, "boxm2CreateStreamCacheProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_roi_init_process, "boxm2RoiInitProcess");
+@@ -58,7 +56,6 @@ void boxm2_register::register_process()
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_scene_from_box_cams_process, "boxm2SceneFromBoxCamsProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_scene_from_nvm_txt_process, "boxm2SceneFromNVMtxtProcess");
+ 
+-  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_load_mesh_process, "boxm2LoadMeshProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_compactify_mog6_view_process, "boxm2CompactifyMog6ViewProcess");
+   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_scene_statistics_process, "boxm2SceneStatisticsProcess");
+ 
+diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx
+deleted file mode 100644
+index bdc59a32e7..0000000000
+--- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx
++++ /dev/null
+@@ -1,213 +0,0 @@
+-// This is brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for exporting a texture mapped mesh of a scene
+-//
+-// \author Vishal Jain
+-// \date Mar 15, 2011
+-
+-#ifdef _MSC_VER
+-#  include "vcl_msvc_warnings.h"
+-#endif
+-#include "vul/vul_file.h"
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_util.h>
+-
+-//vil includes
+-#include "vil/vil_image_view.h"
+-#include "vil/vil_new.h"
+-#include "vil/vil_math.h"
+-
+-//vgl
+-#include "vgl/vgl_point_3d.h"
+-#include <bvgl/bvgl_triangle_interpolation_iterator.h>
+-
+-//det and imesh includes
+-#include <sdet/sdet_image_mesh.h>
+-#include <sdet/sdet_image_mesh_params.h>
+-#include <imesh/imesh_fileio.h>
+-#include <imesh/imesh_operations.h>
+-
+-namespace boxm2_export_mesh_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 4;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm2_export_mesh_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm2_export_mesh_process_globals;
+-
+-  //process takes 2 inputs
+-  int i=0;
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[i++] = "vil_image_view_base_sptr";  //depth image
+-  input_types_[i++] = "vil_image_view_base_sptr";  //x image
+-  input_types_[i++] = "vil_image_view_base_sptr";  //y image
+-  input_types_[i++] = "vcl_string";                //output dir of saved mesh
+-
+-  // process has 1 output
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "imesh_mesh_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm2_export_mesh_process(bprb_func_process& pro)
+-{
+-  using namespace boxm2_export_mesh_process_globals;
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned argIdx = 0;
+-  vil_image_view_base_sptr img = pro.get_input<vil_image_view_base_sptr>(argIdx++);
+-  vil_image_view_base_sptr ximg = pro.get_input<vil_image_view_base_sptr>(argIdx++);
+-  vil_image_view_base_sptr yimg = pro.get_input<vil_image_view_base_sptr>(argIdx++);
+-  std::string out_dir = pro.get_input<std::string>(argIdx++);
+-
+-  //create the mesh directory
+-  if (out_dir != "") {
+-    if (!vul_file::make_directory_path(out_dir.c_str())) {
+-      std::cout<<"Couldn't make directory path "<<out_dir<<std::endl;
+-      return false;
+-    }
+-  }
+-
+-  //cast camera and image so they are useful
+-  auto* z_img = (vil_image_view<float>*) img.ptr();
+-  auto* x_img = (vil_image_view<float>*) ximg.ptr();
+-  auto* y_img = (vil_image_view<float>*) yimg.ptr();
+-
+-  //determine size of depth image
+-  unsigned ni = z_img->ni();
+-  unsigned nj = z_img->nj();
+-
+-  //create new resource sptr
+-  vil_image_resource_sptr z_img_res = vil_new_image_resource_of_view(*z_img);
+-
+-  //initialize some sdet_image_mesh parameters
+-  sdet_image_mesh_params imp;
+-  // sigma of the Gaussian for smoothing the image prior to edge detection
+-  imp.smooth_ = 1.0f;
+-  // the edge detection threshold
+-  imp.thresh_ = 1.68f;
+-  // the shortest edgel chain that is considered for line fitting
+-  imp.min_fit_length_ = 5;
+-
+-  // the threshold on rms pixel distance of edgels to the line
+-  imp.rms_distance_ = 0.11;
+-  // the width in pixels of the transition of a step edge
+-  imp.step_half_width_ = 0.0;
+-
+-  // the mesh processor
+-  sdet_image_mesh im(imp);
+-  im.set_image(z_img_res);
+-  if (!im.compute_mesh()) {
+-    std::cout<<"mesh could not be computed"<<std::endl;
+-    return false;
+-  }
+-  imesh_mesh& mesh = im.get_mesh();
+-  std::cout << "Number of vertices " << mesh.num_verts()
+-           << "  number of faces "<< mesh.num_faces()<< '\n';
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // Take mesh and add points to triangles of high depth variance
+-  // I.E. if a triangle in mesh has corners both very close and very far from top
+-  // camera, take it's centroid point and add x,y,z point, creating 3 new faces
+-  ////////////////////////////////////////////////////////////////////////////////
+-  mesh.compute_vertex_normals_from_faces();
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //// normalize mesh world points to fit in the image_bb from above
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // get min and max z values
+-  float minz=0, maxz=0;
+-  vil_math_value_range(*z_img, minz, maxz);
+-  std::cout<<"Min z: "<<minz<<" Max z: "<<maxz<<std::endl;
+-
+-  //grab vertices in the mesh - convert them to scene coordinates (not image)
+-  imesh_vertex_array<3>& verts = mesh.vertices<3>();
+-  unsigned nverts = mesh.num_verts();
+-  for (unsigned iv = 0; iv<nverts; ++iv)
+-  {
+-    //get coordinates so you can index into the height map
+-    auto i = static_cast<unsigned>(verts[iv][0]);
+-    auto j = static_cast<unsigned>(verts[iv][1]);
+-    if (i<ni && j<nj)
+-    {
+-      verts[iv][0] = (*x_img)(i,j);
+-      verts[iv][1] = (*y_img)(i,j);
+-      verts[iv][2] = (*z_img)(i,j);
+-    }
+-  }
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //// cut tall triangles into quarters (find midpoints of each
+-  ////////////////////////////////////////////////////////////////////////////////
+-//bool did_divide = true;
+-  //while (did_divide)
+-  {
+-    std::set<unsigned int> sel_faces;
+-    double maxLen = (maxz-minz) / 3.0;
+-    auto& faces = (imesh_regular_face_array<3>&) mesh.faces();
+-    imesh_vertex_array<3>&       verts = mesh.vertices<3>();
+-
+-    unsigned nfaces = mesh.num_faces();
+-    for (unsigned iface = 0; iface<nfaces; ++iface)
+-    {
+-      //store three 3d points
+-      std::vector<vgl_point_3d<double> > points;
+-      for (int i=0; i<3; ++i) {
+-        unsigned vertexId = faces[iface][i];
+-        double x = verts[vertexId][0];
+-        double y = verts[vertexId][1];
+-        double z = verts[vertexId][2];
+-        points.emplace_back(x,y,z );
+-      }
+-
+-      // if any one side of the triangle is too long, cut it
+-      double lenA = (points[0]-points[1]).sqr_length(); // vgl_vector length == distance
+-      double lenB = (points[1]-points[2]).sqr_length();
+-      double lenC = (points[0]-points[2]).sqr_length();
+-      maxLen *= maxLen; // sqr
+-      if (lenA > maxLen || lenB > maxLen || lenC > maxLen) {
+-        sel_faces.insert(iface);
+-      }
+-    }
+-
+-    //if the divide face set is not empty, divide the faces
+-    if ( !sel_faces.empty() ) {
+-//    did_divide = true;
+-
+-      std::cout<<"Subdividing mesh"<<std::endl;
+-      imesh_quad_subdivide(mesh, sel_faces);
+-
+-      std::cout<<"Re triangulating mesh"<<std::endl;
+-      imesh_triangulate(mesh);
+-    }
+-//  else {
+-//    did_divide = false;
+-//  }
+-  }
+-
+-  imesh_mesh_sptr mesh_sptr = new imesh_mesh(mesh);
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //// Write out in VRML format
+-  ////////////////////////////////////////////////////////////////////////////////
+-  std::string vrfile = out_dir + "/untextured.wrl";
+-  std::ofstream os(vrfile.c_str());
+-  imesh_write_vrml(os, mesh);
+-  os.close();
+-
+-  // store scene smart pointer
+-  argIdx = 0;
+-  pro.set_output_val<imesh_mesh_sptr>(argIdx++, mesh_sptr);
+-  return true;
+-}
+diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx
+deleted file mode 100644
+index 73e67b8bb6..0000000000
+--- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx
++++ /dev/null
+@@ -1,523 +0,0 @@
+-// This is brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx
+-#include <bprb/bprb_func_process.h>
+-#include <fstream>
+-#include <iostream>
+-#include <utility>
+-//:
+-// \file
+-// \brief  A process for exporting a texture mapped mesh of a scene
+-//
+-// \author Vishal Jain
+-// \date Mar 15, 2011
+-
+-#ifdef _MSC_VER
+-#  include "vcl_msvc_warnings.h"
+-#endif
+-#include "vul/vul_file.h"
+-#include "vul/vul_timer.h"
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_util.h>
+-
+-//vil includes
+-#include "vil/vil_image_view.h"
+-#include "vil/vil_save.h"
+-#include "vil/vil_new.h"
+-
+-//vgl
+-#include "vgl/vgl_distance.h"
+-#include "vgl/vgl_ray_3d.h"
+-#include "vgl/vgl_point_3d.h"
+-#include <bvgl/bvgl_triangle_interpolation_iterator.h>
+-
+-//vpgl camera stuff
+-#include "vpgl/vpgl_perspective_camera.h"
+-
+-//det and imesh includes
+-#include <sdet/sdet_image_mesh.h>
+-#include <sdet/sdet_image_mesh_params.h>
+-#include <imesh/imesh_fileio.h>
+-#include <imesh/algo/imesh_render.h>
+-
+-namespace boxm2_export_textured_mesh_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 6;
+-  constexpr unsigned n_outputs_ = 0;
+-
+-  //helper texture map methods
+-  void boxm2_texture_mesh_from_imgs(std::string im_dir,
+-                                    std::string cam_dir,
+-                                    imesh_mesh& in_mesh,
+-                                    std::map<std::string, imesh_mesh>& meshes);
+-
+-  //populates a vector of visibility images (by face id int)
+-  void boxm2_visible_faces( std::vector<vpgl_perspective_camera<double>* >& cameras,
+-                            std::vector<vil_image_view<int>* >& vis_images,
+-                            imesh_mesh& in_mesh);
+-
+-
+-  //checks if a triangle in UV space is visible.  us and vs are double buffers of length 3
+-  bool face_is_visible( vpgl_perspective_camera<double>* cam,
+-                        vil_image_view<int>* vis_img,
+-                        const double* us,
+-                        const double* vs,
+-                        int face_id);
+-}
+-
+-bool boxm2_export_textured_mesh_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm2_export_textured_mesh_process_globals;
+-
+-  //process takes 2 inputs
+-  int i=0;
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[i++] = "vil_image_view_base_sptr";  //depth image
+-  input_types_[i++] = "vpgl_camera_double_sptr";   //depth image cam
+-  input_types_[i++] = "boxm2_scene_sptr";          //scene object
+-  input_types_[i++] = "vcl_string";                //directory of scene images
+-  input_types_[i++] = "vcl_string";                //directory of corresponding cams
+-  input_types_[i++] = "vcl_string";                //output dir of saved mesh
+-
+-  // process has 1 output
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  //output_types_[0] = "boxm2_scene_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm2_export_textured_mesh_process(bprb_func_process& pro)
+-{
+-  using namespace boxm2_export_textured_mesh_process_globals;
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-
+-  //get the inputs
+-  unsigned argIdx = 0;
+-  vil_image_view_base_sptr img = pro.get_input<vil_image_view_base_sptr>(argIdx++);
+-  vpgl_camera_double_sptr  cam = pro.get_input<vpgl_camera_double_sptr>(argIdx++);
+-  boxm2_scene_sptr       scene = pro.get_input<boxm2_scene_sptr>(argIdx++);
+-  std::string img_dir = pro.get_input<std::string>(argIdx++);
+-  std::string cam_dir = pro.get_input<std::string>(argIdx++);
+-  std::string out_dir = pro.get_input<std::string>(argIdx++);
+-
+-  if (img->pixel_format() == VIL_PIXEL_FORMAT_BYTE)
+-  {
+-    auto* inim = (vil_image_view<vxl_byte>*) img.ptr();
+-    auto* fimg = new vil_image_view<float>(img->ni(), img->nj());
+-    for (unsigned int i=0; i<img->ni(); ++i)
+-      for (unsigned int j=0; j<img->nj(); ++j)
+-        (*fimg)(i,j) = (float) (*inim)(i,j) / 255.0f;
+-    img = vil_image_view_base_sptr(fimg);
+-  }
+-
+-  //create the mesh directory
+-  if (!vul_file::make_directory_path(out_dir.c_str())) {
+-    std::cout<<"Couldn't make directory path "<<out_dir<<std::endl;
+-    return false;
+-  }
+-
+-  //cast camera and image so they are useful
+-  auto* pcam = (vpgl_perspective_camera<double>*) cam.ptr();
+-  auto* depth = (vil_image_view<float>*) img.ptr();
+-
+-  //determine size of depth image
+-  unsigned ni = img->ni();
+-  unsigned nj = img->nj();
+-
+-  //calculate XYZ image image that corresponds to depth image
+-  auto* xyz_img = new vil_image_view<vil_rgba<float> >(ni, nj);
+-  auto* z_img = new vil_image_view<float>(ni,nj);
+-  for (unsigned int i=0; i<ni; ++i) {
+-    for (unsigned int j=0; j<nj; ++j) {
+-      //grab the ray from the camera
+-      vgl_ray_3d<double> ray = pcam->backproject_ray( (double) i+.5, (double) j+.5);
+-
+-      //ray o
+-      float ray_ox = float(ray.origin().x()),
+-            ray_oy = float(ray.origin().y()),
+-            ray_oz = float(ray.origin().z());
+-
+-      //ray dir
+-      float dray_x = float(ray.direction().x()),
+-            dray_y = float(ray.direction().y()),
+-            dray_z = float(ray.direction().z());
+-
+-      //expected ray depth
+-      float ray_t = (*depth)(i,j);
+-
+-      //calculate x,y,z position at expected depth
+-      (*xyz_img)(i,j) = vil_rgba<float>(ray_ox - ray_t*dray_x,
+-                                        ray_oy - ray_t*dray_y,
+-                                        ray_oz - ray_t*dray_z,
+-                                        0.0f);
+-      (*z_img)(i,j) = ray_oz - ray_t*dray_z;
+-    }
+-  }
+-
+-  //////////////////////////////////////////////////////////////////////////////
+-  // Generate 3d mesh from depth image
+-  //////////////////////////////////////////////////////////////////////////////
+-  std::cout<<"Generating image mesh"<<std::endl;
+-
+-  //create new resource sptr
+-  vil_image_resource_sptr z_img_res = vil_new_image_resource_of_view(*z_img);
+-
+-  //initialize some sdet_image_mesh parameters
+-  sdet_image_mesh_params imp;
+-  // sigma of the Gaussian for smoothing the image prior to edge detection
+-  imp.smooth_ = 2.0f;
+-  // the edge detection threshold
+-  imp.thresh_ = 2.0f;
+-  // the shortest edgel chain that is considered for line fitting
+-  imp.min_fit_length_ = 7;
+-  // the threshold on rms pixel distance of edgels to the line
+-  imp.rms_distance_ = 0.1;
+-  // the width in pixels of the transition of a step edge
+-  imp.step_half_width_ = 5.0;
+-
+-  // the mesh processor
+-  sdet_image_mesh im(imp);
+-  im.set_image(z_img_res);
+-  if (!im.compute_mesh()) {
+-    std::cout<<"mesh could not be computed"<<std::endl;
+-    return false;
+-  }
+-  imesh_mesh& mesh = im.get_mesh();
+-  std::cout << "Number of vertices " << mesh.num_verts()
+-           << "  number of faces "<< mesh.num_faces()<< '\n';
+-
+-  std::string meshFile = out_dir + "/wire.wrl";
+-  std::ofstream wos(meshFile.c_str());
+-  imesh_write_vrml(wos, mesh);
+-  wos.close();
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //// normalize mesh world points to fit in the image_bb from above
+-  ////////////////////////////////////////////////////////////////////////////////
+-  vul_timer t;
+-  //grab vertices in the mesh - convert them to scene coordinates (not image)
+-  imesh_vertex_array<3>& verts = mesh.vertices<3>();
+-  unsigned nverts = mesh.num_verts();
+-  for (unsigned iv = 0; iv<nverts; ++iv)
+-  {
+-    //get coordinates so you can index into the height map
+-    auto i = static_cast<unsigned>(verts[iv][0]);
+-    auto j = static_cast<unsigned>(verts[iv][1]);
+-    double scene_x=0, scene_y=0,scene_z = 0.0;
+-    if (i<ni && j<nj) {
+-      scene_x = (*xyz_img)(i,j).R();
+-      scene_y = (*xyz_img)(i,j).G();
+-      scene_z = (*xyz_img)(i,j).B();
+-    }
+-    verts[iv][0] = scene_x;
+-    verts[iv][1] = scene_y;
+-    verts[iv][2] = scene_z;
+-  }
+-  std::cout<<mesh.has_tex_coords()<<std::endl;
+-
+-  //////////////////////////////////////////////////////////////////////////////
+-  //Texture map the mesh
+-  //////////////////////////////////////////////////////////////////////////////
+-  //boxm2_texture_mesh_topdown(img_dir, cam_dir, mesh);
+-  std::map<std::string, imesh_mesh> meshes;
+-  boxm2_texture_mesh_from_imgs(img_dir, cam_dir, mesh, meshes);
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //// Write out in VRML format
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //output file and stream
+-  std::string vrfile = out_dir + "/vrmesh.wrl";
+-  std::ofstream os(vrfile.c_str());
+-
+-  //write each submesh into one file
+-  std::map<std::string, imesh_mesh>::iterator subMesh;
+-  for (subMesh = meshes.begin(); subMesh != meshes.end(); ++subMesh)
+-  {
+-    imesh_mesh& sMesh = subMesh->second;
+-    std::cout<<"Writing sub mesh: "<<sMesh.tex_source()<<" has "<<sMesh.num_faces()<<" faces"<<std::endl;
+-    imesh_write_vrml(os, sMesh);
+-  }
+-  os.close();
+-  std::cout<<"Texture Mapping Mesh Time: "<<t.all()<<"ms"<<std::endl;
+-
+-  return true;
+-}
+-
+-
+-//Given a directory of images, dir cams, an input mesh, this function creates
+-//map of textured meshes (imesh doesn't ostensibly handle meshes from multiple textures)
+-void boxm2_export_textured_mesh_process_globals::boxm2_texture_mesh_from_imgs(std::string im_dir,
+-                                                                              std::string cam_dir,
+-                                                                              imesh_mesh& in_mesh,
+-                                                                              std::map<std::string, imesh_mesh>& meshes)
+-{
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // BEGIN TEXTURE MAPPING
+-  // Gather cameras and iamges that will contribute to the texture
+-  ////////////////////////////////////////////////////////////////////////////////
+-  std::vector<std::string> camfiles = boxm2_util::camfiles_from_directory(std::move(cam_dir));
+-  std::vector<std::string> imfiles = boxm2_util::images_from_directory(std::move(im_dir));
+-
+-  std::vector<vpgl_perspective_camera<double>* > cameras;
+-  for (auto & camfile : camfiles) {
+-    //build the camera from file
+-    std::ifstream ifs(camfile.c_str());
+-    auto* icam = new vpgl_perspective_camera<double>;
+-    if (!ifs.is_open()) {
+-      std::cerr << "Failed to open file " << camfile << '\n';
+-      return;
+-    }
+-    ifs >> *icam;
+-    cameras.push_back(icam);
+-    std::cout<<icam->principal_axis()<<std::endl;
+-  }
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // Grab input mesh vertices and input mesh faces
+-  ////////////////////////////////////////////////////////////////////////////////
+-  in_mesh.compute_vertex_normals_from_faces();
+-  auto& in_faces = (imesh_regular_face_array<3>&) in_mesh.faces();
+-  unsigned nfaces = in_mesh.num_faces();
+-  imesh_vertex_array<3>& in_verts = in_mesh.vertices<3>();
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // Render Visibility Images
+-  ////////////////////////////////////////////////////////////////////////////////
+-  std::vector<vil_image_view<int>* > vis_images;
+-  boxm2_visible_faces(cameras, vis_images, in_mesh);
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // For each Face:
+-  //   determine which image is closest in normal and visible, store face index in a map[image_str, vector<int>face]
+-  ////////////////////////////////////////////////////////////////////////////////
+-  //texture index
+-  std::cout<<"Populating faces for each texture"<<std::endl;
+-  std::map<std::string, std::vector<unsigned> > app_faces; //image_name to face_list
+-  std::map<std::string, vpgl_perspective_camera<double>* > texture_cams;
+-  for (unsigned iface = 0; iface<nfaces; ++iface)
+-  {
+-    //create list of cameras from which you can see this face
+-    std::vector<vpgl_perspective_camera<double>* > visible_views;
+-    for (unsigned int i=0; i<vis_images.size(); ++i) {
+-      //project triangle
+-      double us[3], vs[3];
+-      for (int vIdx=0; vIdx<3; ++vIdx) {
+-        unsigned vertIdx = in_faces[iface][vIdx];
+-
+-        //project these verts into UV
+-        double x = in_verts[vertIdx][0], y = in_verts[vertIdx][1], z = in_verts[vertIdx][2];
+-        double u,v;
+-        cameras[i]->project(x, y, z, u, v);
+-        us[vIdx] = u;
+-        vs[vIdx] = v;
+-      }
+-      if ( face_is_visible( cameras[i], vis_images[i], us, vs, iface) )
+-        visible_views.push_back(cameras[i]);
+-    }
+-
+-    //now compare the normal to each of the visible view cameras
+-    vgl_vector_3d<double>& normal = in_faces.normal(iface);
+-
+-    //find camera with the closest look vector to this normal
+-    int closeIdx = boxm2_util::find_nearest_cam(normal, visible_views);
+-    vpgl_perspective_camera<double>* closest = nullptr;
+-    std::string im_name = "empty";
+-    if (closeIdx >= 0) {
+-      closest = cameras[closeIdx];
+-      im_name = imfiles[closeIdx];
+-    }
+-
+-    //grab appropriate face list (create it if it's not there)
+-    auto iter = app_faces.find(im_name);
+-    if ( iter == app_faces.end() ) {
+-      std::cout<<"Adding image: "<<im_name<<" to texture list"<<std::endl;
+-      std::vector<unsigned> faceList;
+-      faceList.push_back(iface);
+-      app_faces[im_name] = faceList;
+-
+-      //keep track of the camera
+-      texture_cams[im_name] = closest;
+-    }
+-    else {
+-      app_faces[im_name].push_back(iface);
+-    }
+-  }
+-
+-  ////////////////////////////////////////////////////////////////////////////////
+-  // For each image/appearance:
+-  //   - create a vert list
+-  //   - create a face list
+-  //   - create a sub mesh that is textured
+-  ////////////////////////////////////////////////////////////////////////////////
+-
+-  //for each appearance (texture image), create an imesh_mesh (subMesh);
+-  std::cout<<"Creating Sub Meshes for each texture"<<std::endl;
+-  std::map<std::string, std::vector<unsigned> >::iterator apps;
+-  for (apps = app_faces.begin(); apps != app_faces.end(); ++apps)
+-  {
+-    //for each appearance, we're creating a whole new mesh
+-    // first create the face list
+-    auto* flist = new imesh_regular_face_array<3>();
+-
+-    //now create the vertex list
+-    auto* verts3 = new imesh_vertex_array<3>();
+-
+-    //get faces list corresponding to this texture
+-    std::vector<unsigned>& face_list = apps->second;
+-    for (unsigned int i=0; i<face_list.size(); ++i) {
+-      //get old face
+-      unsigned old_fIdx = face_list[i];
+-
+-      //old face vertices
+-      unsigned v1 = in_faces[old_fIdx][0];
+-      unsigned v2 = in_faces[old_fIdx][1];
+-      unsigned v3 = in_faces[old_fIdx][2];
+-
+-      //push these vertices onto the new vert list
+-      verts3->push_back( imesh_vertex<3>(in_verts[v1][0], in_verts[v1][1], in_verts[v1][2]) );
+-      verts3->push_back( imesh_vertex<3>(in_verts[v2][0], in_verts[v2][1], in_verts[v2][2]) );
+-      verts3->push_back( imesh_vertex<3>(in_verts[v3][0], in_verts[v3][1], in_verts[v3][2]) );
+-
+-      imesh_tri tri(3*i, 3*i+1, 3*i+2);
+-      flist->push_back(tri);
+-    }
+-
+-    //create the submesh using the auto ptrs
+-    std::unique_ptr<imesh_vertex_array_base> v3(verts3);
+-    std::unique_ptr<imesh_face_array_base> f3(flist);
+-    imesh_mesh subMesh(std::move(v3), std::move(f3));
+-
+-    std::cout<<"Setting tex source: "<<apps->first<<std::endl;
+-    meshes[apps->first] = subMesh;
+-    meshes[apps->first].set_tex_source(apps->first);
+-  }
+-
+-  //////////////////////////////////////////////////////////////////////////////
+-  //For each mesh, map each vertex
+-  //////////////////////////////////////////////////////////////////////////////
+-  std::cout<<"Mapping sub meshes for each texture"<<std::endl;
+-  std::map<std::string, imesh_mesh>::iterator subMesh;
+-  auto txCam = texture_cams.begin();
+-  for (subMesh = meshes.begin(); subMesh != meshes.end(); ++subMesh, ++txCam)
+-  {
+-    imesh_mesh& mesh = subMesh->second;
+-    imesh_vertex_array<3>& verts = mesh.vertices<3>();
+-    unsigned nverts = mesh.num_verts();
+-
+-    //texture map the non empty appearances
+-    if (txCam->first != "empty")
+-    {
+-      std::vector<vgl_point_2d<double> > tex_coords(nverts, vgl_point_2d<double>(0.0,0.0));
+-      for (unsigned iv = 0; iv<nverts; ++iv)
+-      {
+-        //find camera corresponding to this texture
+-        vpgl_perspective_camera<double>* closest = txCam->second;
+-        vgl_point_2d<double> principal_point = closest->get_calibration().principal_point();
+-        double ni = principal_point.x()*2.0;
+-        double nj = principal_point.y()*2.0;
+-
+-        //project the vertex onto the camera, store the texture coordinate
+-        double x = verts[iv][0];
+-        double y = verts[iv][1];
+-        double z = verts[iv][2];
+-        double u,v;
+-        closest->project(x, y, z, u, v);
+-
+-        //flip v about the y axis
+-        v=nj-v;
+-
+-        //store the tex_coordinate
+-        vgl_point_2d<double> uv(u/ni,v/nj);
+-        tex_coords[iv] = uv;
+-      }
+-      mesh.set_tex_coords(tex_coords);
+-    }
+-  }
+-}
+-
+-bool boxm2_export_textured_mesh_process_globals::face_is_visible( vpgl_perspective_camera<double>*  /*cam*/,
+-                                                                  vil_image_view<int>* vis_img,
+-                                                                  const double* us,
+-                                                                  const double* vs,
+-                                                                  int face_id)
+-{
+-  //now create a polygon, and find the integer image coordinates (U,V) that this polygon covers
+-  int ni = vis_img->ni();
+-  int nj = vis_img->nj();
+-
+-  vgl_triangle_scan_iterator<double> tsi;
+-  tsi.a.x = us[0];  tsi.a.y = vs[0];
+-  tsi.b.x = us[1];  tsi.b.y = vs[1];
+-  tsi.c.x = us[2];  tsi.c.y = vs[2];
+-  for (tsi.reset(); tsi.next(); ) {
+-    int y = tsi.scany();
+-    if (y<0 || y>=nj) continue;
+-    int min_x = tsi.startx();
+-    int max_x = tsi.endx();
+-    if (min_x >= ni || max_x < 0)
+-      continue;
+-    if (min_x < 0) min_x = 0;
+-    if (max_x >= ni) max_x = ni-1;
+-    for (int x = min_x; x <= max_x; ++x) {
+-      if ( (*vis_img)(x,y) != face_id )
+-        return false;
+-    }
+-  }
+-
+-  //if it made it this far, it's completely visible
+-  return true;
+-}
+-
+-
+-void boxm2_export_textured_mesh_process_globals::boxm2_visible_faces( std::vector<vpgl_perspective_camera<double>* >& cameras,
+-                                                                      std::vector<vil_image_view<int >* >& vis_images,
+-                                                                      imesh_mesh& in_mesh)
+-{
+-  auto& in_faces = (imesh_regular_face_array<3>&) in_mesh.faces();
+-  unsigned nfaces = in_mesh.num_faces();
+-  imesh_vertex_array<3>& in_verts = in_mesh.vertices<3>();
+-
+-  //iterate over each camera, creating a visibility image for each
+-  for (auto pcam : cameras)
+-  {
+-    //get the principal point of the cam for image size
+-    vgl_point_2d<double> principal_point = pcam->get_calibration().principal_point();
+-    auto ni = (unsigned) (principal_point.x()*2.0);
+-    auto nj = (unsigned) (principal_point.y()*2.0);
+-
+-    // render the face_id/distance image
+-    vil_image_view<double> depth_im(ni, nj);
+-    auto*   face_im = new vil_image_view<int>(ni, nj);
+-    depth_im.fill(10e100);  //Initial depth is huge,
+-    face_im->fill(-1); //initial face id is -1
+-    for (unsigned iface = 0; iface<nfaces; ++iface)
+-    {
+-      //get the vertices from the face, project into UVs
+-      double us[3], vs[3], dists[3];
+-      for (int vIdx=0; vIdx<3; ++vIdx) {
+-        unsigned vertIdx = in_faces[iface][vIdx];
+-
+-        //project these verts into UV
+-        double x = in_verts[vertIdx][0], y = in_verts[vertIdx][1], z = in_verts[vertIdx][2];
+-        double u,v;
+-        pcam->project(x, y, z, u, v);
+-        us[vIdx] = u;
+-        vs[vIdx] = v;
+-
+-        //keep track of distance to each vertex
+-        dists[vIdx] = vgl_distance(vgl_point_3d<double>(x,y,z), pcam->get_camera_center());
+-      }
+-
+-      //render the triangle label onto the label image, using the depth image
+-      vgl_point_3d<double> v1(us[0], vs[0], dists[0]);
+-      vgl_point_3d<double> v2(us[1], vs[1], dists[1]);
+-      vgl_point_3d<double> v3(us[2], vs[2], dists[2]);
+-      imesh_render_triangle_label<int>(v1, v2, v3, (int) iface, (*face_im), depth_im);
+-    } //end for iface
+-
+-    //keep the vis_image just calculated
+-    vis_images.push_back(face_im);
+-    vil_save(depth_im, "/media/VXL/mesh/downtown/dist_im.tif");
+-  }
+-}
+diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx
+deleted file mode 100644
+index 78c545a3fd..0000000000
+--- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx
++++ /dev/null
+@@ -1,78 +0,0 @@
+-// This is brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx
+-#include <iostream>
+-#include <fstream>
+-#include <bprb/bprb_func_process.h>
+-//:
+-// \file
+-// \brief  A process for loading a  mesh
+-//
+-// \author Vishal Jain
+-// \date Mar 15, 2013
+-
+-#ifdef _MSC_VER
+-#  include "vcl_msvc_warnings.h"
+-#endif
+-#include "vul/vul_file.h"
+-#include "vul/vul_timer.h"
+-#include "vnl/vnl_random.h"
+-#include <boxm2/boxm2_scene.h>
+-#include <boxm2/boxm2_util.h>
+-
+-//vil includes
+-#include "vil/vil_image_view.h"
+-#include "vil/vil_save.h"
+-#include <vil/algo/vil_gauss_filter.h>
+-
+-//vgl
+-#include "vgl/vgl_distance.h"
+-#include "vgl/vgl_triangle_scan_iterator.h"
+-#include <bvgl/bvgl_triangle_interpolation_iterator.h>
+-
+-//vpgl camera stuff
+-#include "vpgl/vpgl_perspective_camera.h"
+-
+-//det and imesh includes
+-#include <sdet/sdet_image_mesh.h>
+-#include <sdet/sdet_image_mesh_params.h>
+-#include <imesh/imesh_fileio.h>
+-#include <imesh/algo/imesh_render.h>
+-
+-namespace boxm2_load_mesh_process_globals
+-{
+-  constexpr unsigned n_inputs_ = 1;
+-  constexpr unsigned n_outputs_ = 1;
+-}
+-
+-bool boxm2_load_mesh_process_cons(bprb_func_process& pro)
+-{
+-  using namespace boxm2_load_mesh_process_globals;
+-
+-  //process takes 2 inputs
+-  int i=0;
+-  std::vector<std::string> input_types_(n_inputs_);
+-  input_types_[i++] = "vcl_string";       //mesh filename
+-
+-  // process has 1 output
+-  std::vector<std::string>  output_types_(n_outputs_);
+-  output_types_[0] = "imesh_mesh_sptr";
+-
+-  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
+-}
+-
+-bool boxm2_load_mesh_process(bprb_func_process& pro)
+-{
+-  using namespace boxm2_load_mesh_process_globals;
+-  if ( pro.n_inputs() < n_inputs_ ) {
+-    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
+-    return false;
+-  }
+-  unsigned argIdx = 0;
+-  std::string mesh_filename = pro.get_input<std::string>(argIdx++);
+-  imesh_mesh_sptr mesh = new imesh_mesh();
+-  imesh_read(mesh_filename, *(mesh.ptr()));
+-  std::cout<<"# of faces "<<mesh->num_faces()<<std::endl;
+-  pro.set_output_val<imesh_mesh_sptr>(0,mesh);
+-
+-
+-  return true;
+-}
+-- 
+2.46.1
+

0018-Added-sonames-to-vgui-vidl-vpdl-Qv-libs.patch

@@ -1,64 +0,0 @@
-From 354b76db3c873078198017ca33a22dcfc217be09 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Sun, 14 Oct 2012 17:38:51 +0200
-Subject: [PATCH 18/23] Added sonames to vgui vidl vpdl Qv libs
-
----
- core/vgui/CMakeLists.txt     | 1 +
- core/vidl/gui/CMakeLists.txt | 1 +
- core/vpdl/CMakeLists.txt     | 1 +
- v3p/Qv/CMakeLists.txt        | 2 +-
- 4 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/core/vgui/CMakeLists.txt b/core/vgui/CMakeLists.txt
-index df5eb3b..0dc1121 100644
---- a/core/vgui/CMakeLists.txt
-+++ b/core/vgui/CMakeLists.txt
-@@ -518,6 +518,7 @@ SET( vgui_sources ${vgui_sources}
- )
- 
- ADD_LIBRARY(vgui ${vgui_sources})
-+SET_TARGET_PROPERTIES(vgui PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vgui)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vgui ${vgui_sources})
- SET( VGUI_FOUND "YES" CACHE INTERNAL "Was vgui successfully built?" )
-diff --git a/core/vidl/gui/CMakeLists.txt b/core/vidl/gui/CMakeLists.txt
-index 3ecc67f..c055a55 100644
---- a/core/vidl/gui/CMakeLists.txt
-+++ b/core/vidl/gui/CMakeLists.txt
-@@ -12,6 +12,7 @@ SET(vidl_gui_sources
-    )
- 
- ADD_LIBRARY(vidl_gui ${vidl_gui_sources})
-+SET_TARGET_PROPERTIES(vidl_gui PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib vidl_gui)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl/gui ${vidl_gui_sources})
- TARGET_LINK_LIBRARIES( vidl_gui vidl vgui vil )
-diff --git a/core/vpdl/CMakeLists.txt b/core/vpdl/CMakeLists.txt
-index 7f7fcd8..263cd8c 100644
---- a/core/vpdl/CMakeLists.txt
-+++ b/core/vpdl/CMakeLists.txt
-@@ -48,6 +48,7 @@ SET( vpdl_sources
- AUX_SOURCE_DIRECTORY(Templates vpdl_sources)
- 
- ADD_LIBRARY(vpdl ${vpdl_sources})
-+SET_TARGET_PROPERTIES(vpdl PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( vpdl vnl_algo vnl )
- 
- INSTALL_TARGETS(/lib vpdl)
-diff --git a/v3p/Qv/CMakeLists.txt b/v3p/Qv/CMakeLists.txt
-index 75bd643..e53f334 100644
---- a/v3p/Qv/CMakeLists.txt
-+++ b/v3p/Qv/CMakeLists.txt
-@@ -169,7 +169,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY( Qv ${Qv_sources} )
--
-+SET_TARGET_PROPERTIES(Qv PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( Qv vcl )
- 
- INSTALL_TARGETS(/lib Qv)
--- 
-1.7.11.7
-

0018-chore-remove-ctest-dashboard-config.patch

@@ -0,0 +1,43 @@
+From 99f96d0e6d18996ad58d34998d08f022585ae77b Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Wed, 2 Oct 2024 14:39:51 +0100
+Subject: [PATCH 18/18] chore: remove ctest dashboard config
+
+---
+ CMakeLists.txt    | 4 ----
+ CTestConfig.cmake | 8 --------
+ 2 files changed, 12 deletions(-)
+ delete mode 100644 CTestConfig.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e1aa0390d4..810a1f4b21 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -322,10 +322,6 @@ configure_file( ${VXL_CMAKE_DIR}/UseVXL.cmake
+ # For use in client projects that call UseVXL.cmake
+ set(VXL_LIBRARY_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} CACHE STATIC "Where all the vxl libraries are, for clients to use." )
+ 
+-# Copy CTestCustom.cmake to top of build tree
+-configure_file( ${VXL_CMAKE_DIR}/CTestCustom.cmake
+-  ${VXL_BINARY_DIR}/CTestCustom.cmake COPYONLY )
+-
+ # This command must be the last command in this file
+ if(NOT VXL_NO_EXPORT)
+   include(${CMAKE_CURRENT_LIST_DIR}/config/cmake/export/VXLCreateProject.cmake)
+diff --git a/CTestConfig.cmake b/CTestConfig.cmake
+deleted file mode 100644
+index f2620f7bf6..0000000000
+--- a/CTestConfig.cmake
++++ /dev/null
+@@ -1,8 +0,0 @@
+-# CTest Configuration for VXL
+-set(CTEST_PROJECT_NAME "VXL")
+-set(CTEST_NIGHTLY_START_TIME "22:00:00 EST")
+-
+-set(CTEST_DROP_METHOD "http")
+-set(CTEST_DROP_SITE "open.cdash.org")
+-set(CTEST_DROP_LOCATION "/submit.php?project=vxl")
+-set(CTEST_DROP_SITE_CDASH TRUE)
+-- 
+2.46.1
+

0019-Removed-box2m-which-requires-OpenCL-libraries.patch

@@ -1,35 +0,0 @@
-From aefaa1d2e0e621d7f3ef2ea420c92bd0c0f29e64 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Fri, 2 Nov 2012 14:40:49 +0100
-Subject: [PATCH 19/23] Removed box2m which requires OpenCL libraries
-
----
- contrib/brl/bseg/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/contrib/brl/bseg/CMakeLists.txt b/contrib/brl/bseg/CMakeLists.txt
-index b0e3a56..31ea0b5 100644
---- a/contrib/brl/bseg/CMakeLists.txt
-+++ b/contrib/brl/bseg/CMakeLists.txt
-@@ -48,10 +48,10 @@ SUBDIRS(boct)
- SUBDIRS(boxm)
- 
- # updated, gpu compatible octree based modeling
--SUBDIRS(boxm2)
-+#SUBDIRS(boxm2)
- 
- # updated, gpu compatible octree based modeling
--SUBDIRS(boxm2_batch)
-+#SUBDIRS(boxm2_batch)
- 
- # octree based modeling python interface
- SUBDIRS(boxm_batch)
-@@ -72,4 +72,4 @@ SUBDIRS(bapl)
- SUBDIRS(boxm_bridge)
- 
- #multi gpu library
--SUBDIRS(boxm2_multi)
-+#SUBDIRS(boxm2_multi)
--- 
-1.7.11.7
-

0020-Included-missing-vcl_cstdio.h-header.patch

@@ -1,24 +0,0 @@
-From fc074ee4b8c2f09a554646ba983622dfb8a75fb5 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Fri, 2 Nov 2012 14:41:23 +0100
-Subject: [PATCH 20/23] Included missing vcl_cstdio.h header
-
----
- .../core/vpgl_pro/processes/vpgl_load_perspective_camera_process.cxx     | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/contrib/brl/bpro/core/vpgl_pro/processes/vpgl_load_perspective_camera_process.cxx b/contrib/brl/bpro/core/vpgl_pro/processes/vpgl_load_perspective_camera_process.cxx
-index 10fe8a7..1082e34 100644
---- a/contrib/brl/bpro/core/vpgl_pro/processes/vpgl_load_perspective_camera_process.cxx
-+++ b/contrib/brl/bpro/core/vpgl_pro/processes/vpgl_load_perspective_camera_process.cxx
-@@ -5,6 +5,7 @@
- 
- #include <vcl_iostream.h>
- #include <vcl_fstream.h>
-+#include <vcl_cstdio.h>
- #include <vpgl/vpgl_camera_double_sptr.h>
- #include <vpgl/vpgl_perspective_camera.h>
- #include <vpgl/io/vpgl_io_perspective_camera.h>
--- 
-1.7.11.7
-

0021-Use-expatpp.h-which-is-provided-by-fedora-repos.patch

@@ -1,25 +0,0 @@
-From 347dc1b1fe80c9b24a728b142698738f8b6dced2 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Fri, 2 Nov 2012 14:47:07 +0100
-Subject: [PATCH 21/23] Use expatpp.h which is provided by fedora repos
-
----
- contrib/brl/bbas/bvgl/bvgl_labelme_parser.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
-index 5740677..bded971 100644
---- a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
-+++ b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
-@@ -2,7 +2,7 @@
- #ifndef bvgl_labelme_parser_h_
- #define bvgl_labelme_parser_h_
- 
--#include <expatpplib.h>
-+#include <expatpp.h>
- #include <vcl_string.h>
- #include <vcl_sstream.h>
- #include <vgl/vgl_polygon.h>
--- 
-1.7.11.7
-

0022-Include-missing-vcl_cstdio.h-header.patch

@@ -1,24 +0,0 @@
-From ec88b62f858fd9c03dd58d18d4f52d4f1e9aa784 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Fri, 2 Nov 2012 14:48:14 +0100
-Subject: [PATCH 22/23] Include missing vcl_cstdio.h header
-
----
- contrib/brl/bbas/volm/volm_io.cxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/contrib/brl/bbas/volm/volm_io.cxx b/contrib/brl/bbas/volm/volm_io.cxx
-index 07e695f..02964fb 100755
---- a/contrib/brl/bbas/volm/volm_io.cxx
-+++ b/contrib/brl/bbas/volm/volm_io.cxx
-@@ -11,6 +11,7 @@
- #include <bsol/bsol_algs.h>
- #include <vcl_iostream.h>
- #include <vcl_iomanip.h>
-+#include <vcl_cstdio.h>
- 
- //:
- // \file
--- 
-1.7.11.7
-

0023-Remove-volm-because-of-error-in-function-prototype.patch

@@ -1,23 +0,0 @@
-From b26213c75a1a5f1b9d3ccabab89b1a68d7dffa24 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Fri, 2 Nov 2012 14:50:10 +0100
-Subject: [PATCH 23/23] Remove volm because of error in function prototype
-
----
- contrib/brl/bbas/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/brl/bbas/CMakeLists.txt b/contrib/brl/bbas/CMakeLists.txt
-index 63f57d4..1628c61 100644
---- a/contrib/brl/bbas/CMakeLists.txt
-+++ b/contrib/brl/bbas/CMakeLists.txt
-@@ -90,5 +90,5 @@ SUBDIRS(bcvr)
- SUBDIRS(bkml)
- 
- # volumetric matching tools
--SUBDIRS(volm)
-+#SUBDIRS(volm)
- 
--- 
-1.7.11.7
-

0024-Added-missing-sonames-for-mvl2-and-vepl1.patch

@@ -1,37 +0,0 @@
-From 57527d9b27af9772681dac3d6efa2e4c93232689 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa <mrceresa@gmail.com>
-Date: Sun, 25 Nov 2012 12:30:16 +0100
-Subject: [PATCH 24/24] Added missing sonames for mvl2 and vepl1
-
----
- contrib/mul/mvl2/CMakeLists.txt  | 1 +
- contrib/tbl/vepl1/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/contrib/mul/mvl2/CMakeLists.txt b/contrib/mul/mvl2/CMakeLists.txt
-index 8870a91..9994443 100644
---- a/contrib/mul/mvl2/CMakeLists.txt
-+++ b/contrib/mul/mvl2/CMakeLists.txt
-@@ -54,6 +54,7 @@ ENDIF (AVIFILE_FOUND)
- ADD_LIBRARY(mvl2 ${mvl2_sources})
- INSTALL_TARGETS(/lib mvl2)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mvl2 ${mvl2_sources})
-+SET_TARGET_PROPERTIES(mvl2 PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES( mvl2 vil vul ${AVIFILE_LIBRARIES} )
- 
- IF (AVIFILE_FOUND)
-diff --git a/contrib/tbl/vepl1/CMakeLists.txt b/contrib/tbl/vepl1/CMakeLists.txt
-index 1cc2295..0b7303f 100644
---- a/contrib/tbl/vepl1/CMakeLists.txt
-+++ b/contrib/tbl/vepl1/CMakeLists.txt
-@@ -47,6 +47,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- ADD_LIBRARY(vepl1 ${vepl1_sources})
- INSTALL_TARGETS(/lib vepl1)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vepl1 ${vepl1_sources})
-+SET_TARGET_PROPERTIES(vepl1 PROPERTIES ${VXL_LIBRARY_PROPERTIES})
- TARGET_LINK_LIBRARIES(vepl1 vipl vil1 ${CMAKE_THREAD_LIBS})
- 
- IF (BUILD_EXAMPLES)
--- 
-1.7.11.7
-

0025-Legacy-def1-r35963.patch

@@ -1,37 +0,0 @@
-commit 849fcbd56d9e55a59608ea1df8da82dcb5dbeb68
-Author: peter_vanroose <peter_vanroose@4b17d0e5-ac7a-4109-a8ed-6b3c4e86a14a>
-Date:   Wed Nov 14 13:42:48 2012 +0000
-
-    added back in the vnl_math_* functions, now as #defines to their vnl_math::* counterparts in the "real" vnl_math namespace
-    
-    git-svn-id: https://svn.code.sf.net/p/vxl/svn/trunk@35963 4b17d0e5-ac7a-4109-a8ed-6b3c4e86a14a
-
-diff --git a/core/vnl/vnl_math.h b/core/vnl/vnl_math.h
-index c458dae..adb5fb4 100644
---- a/core/vnl/vnl_math.h
-+++ b/core/vnl/vnl_math.h
-@@ -659,4 +659,24 @@ namespace vnl_math
- 
- } // end of namespace vnl_math
- 
-+// Legacy definitions, for backward compatibility:
-+#define vnl_math_isnan vnl_math::isnan
-+#define vnl_math_isinf vnl_math::isinf
-+#define vnl_math_isfinite vnl_math::isfinite
-+#define vnl_math_rnd_halfinttoeven vnl_math::rnd_halfinttoeven
-+#define vnl_math_rnd_halfintup vnl_math::rnd_halfintup
-+#define vnl_math_rnd vnl_math::rnd
-+#define vnl_math_floor vnl_math::floor
-+#define vnl_math_ceil vnl_math::ceil
-+#define vnl_math_abs vnl_math::abs
-+#define vnl_math_max vnl_math::max
-+#define vnl_math_min vnl_math::min
-+#define vnl_math_sqr vnl_math::sqr
-+#define vnl_math_cube vnl_math::cube
-+#define vnl_math_sgn vnl_math::sgn
-+#define vnl_math_sgn0 vnl_math::sgn0
-+#define vnl_math_squared_magnitude vnl_math::squared_magnitude
-+#define vnl_math_cuberoot vnl_math::cuberoot
-+#define vnl_math_hypot vnl_math::hypot
-+
- #endif // vnl_math_h_

0026-Legacy-def2-r36001.patch

@@ -1,46 +0,0 @@
-commit 528908a1663fc7e38ee8d7e426cd31853039679b
-Author: peter_vanroose <peter_vanroose@4b17d0e5-ac7a-4109-a8ed-6b3c4e86a14a>
-Date:   Fri Nov 16 12:43:57 2012 +0000
-
-    moved the backward compatibility #defines (vnl_math_floor etc. for vnl_math::floor etc.) inside #if VNL_CONFIG_LEGACY_METHODS; switching that option on will additionally trigger a "deprecated" compile warning
-    
-    git-svn-id: https://svn.code.sf.net/p/vxl/svn/trunk@36001 4b17d0e5-ac7a-4109-a8ed-6b3c4e86a14a
-
-diff --git a/core/vnl/vnl_math.h b/core/vnl/vnl_math.h
-index adb5fb4..34af06b 100644
---- a/core/vnl/vnl_math.h
-+++ b/core/vnl/vnl_math.h
-@@ -35,6 +35,7 @@
- //   Amitha Perera - 13 Sep 2002 - make constant initialization standards compliant.
- //   Peter Vanroose -22 Oct 2012 - was a class, now is a namespace
- //                                 also renamed functions vnl_math_isnan etc. to vnl_math::isnan
-+//   Peter Vanroose -15 Nov 2012 - the deprecated vnl_math_* #defines are now only available when VNL_CONFIG_LEGACY_METHODS==1
- // \endverbatim
- 
- #include <vcl_cmath.h>
-@@ -44,6 +45,9 @@
- #ifdef VNL_CHECK_FPU_ROUNDING_MODE
- # include <vcl_cassert.h>
- #endif
-+#if VNL_CONFIG_LEGACY_METHODS
-+# include <vcl_deprecated.h>
-+#endif
- 
- // Figure out when the fast implementation can be used
- #if VNL_CONFIG_ENABLE_SSE2_ROUNDING
-@@ -659,7 +663,7 @@ namespace vnl_math
- 
- } // end of namespace vnl_math
- 
--// Legacy definitions, for backward compatibility:
-+#if VNL_CONFIG_LEGACY_METHODS // Legacy definitions, for backward compatibility; deprecated!
- #define vnl_math_isnan vnl_math::isnan
- #define vnl_math_isinf vnl_math::isinf
- #define vnl_math_isfinite vnl_math::isfinite
-@@ -678,5 +682,6 @@ namespace vnl_math
- #define vnl_math_squared_magnitude vnl_math::squared_magnitude
- #define vnl_math_cuberoot vnl_math::cuberoot
- #define vnl_math_hypot vnl_math::hypot
-+#endif // VNL_CONFIG_LEGACY_METHODS
- 
- #endif // vnl_math_h_

changelog

@@ -0,0 +1,203 @@
+* Tue Nov 15 2022 Sandro Mani <manisandro@gmail.com> - 2.0.2-15
+- Rebuild (minizip-ng)
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Feb 09 2021 Miro Hrončok <mhroncok@redhat.com> - 2.0.2-11
+- Rebuilt for minizip 3.0.0
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Oct 17 2020 Jeff Law <law@redhat.com> - 2.0.2-9
+- Fix missing #includes for gcc-11
+
+* Mon Jul 27 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-8
+- Rebuild for libdc1394 soname bump
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Sep 15 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-6
+- Fix failing build: update patch to fix minizip include
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue May 28 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-4
+- Remove obsolete boxm library (was also causing arm build to fail)
+- Remove obsolete octree library
+
+* Tue May 28 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-3
+- Fix 32 bit arch builds: https://github.com/vxl/vxl/issues/638
+- Remove invalid comments
+- Do not make docs require the base package
+
+* Fri Apr 26 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-2
+- Add complete file list
+- Remove no longer needed BR: klt
+- Remove more unneeded patches
+- Add patch to include FindRPLY.cmake
+- Use system shapelib and expat
+- More patches to complete build
+- Document failing tests, do not let them fail build
+
+* Fri Apr 19 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-2
+- Enable OUL---why was it disabled?
+- Remove rply include patch: build seems to find it just fine.
+- Remove uneeded rply function call fix patch.
+- Remove Coin3D cmake config patch---included in cmake distribution now.
+- Remove SIMVoleon cmake patch---seems to find it just fine.
+- Correct CMake flags.
+- Enable BRL build
+- add Python BR
+- Add expatpp bits manually
+- File upstream issue and use bundled openjpeg2: https://github.com/vxl/vxl/issues/627
+- Remove unneeded xerces BR, and corresponding patch.
+
+* Thu Apr 18 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-1
+- Update to latest upstream release
+- Temporarily use bundled dcmtk (https://github.com/vxl/vxl/issues/550)
+- Use new github upstream
+- Remove uneeded patches
+- Explicitly list all shared objects
+
+* Sat Mar 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 1.17.0-31
+- Rebuild for dcmtk-3.6.4
+
+* Sun Feb 17 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.17.0-30
+- Use autosetup macro
+- Remove whitespaces, use space instead of tabs for cleanliness
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Aug 28 2018 Patrik Novotný <panovotn@redhat.com> - 1.17.0-28
+- change requires to minizip-compat(-devel), rhbz#1609830, rhbz#1615381
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 1.17.0-26
+- Rebuild to fix GCC 8 mis-compilation
+  See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb 25 2016 Tom Callaway <spot@fedoraproject.org> - 1.17.0-20
+- remove non-free lena image file from source tarball (bz1310388)
+- fix FTBFS (bz1303695, bz1308234)
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 16 2015 Sebastian Pölsterl <sebp@k-d-w.org> - 1.17.0-17
+- Rebuilt using hardened build flags: https://fedoraproject.org/wiki/Changes/Harden_All_Packages
+
+* Mon Feb 16 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.17.0-16
+- Add vxl-0.17.0-gcc5.diff (Work-around GCC-5.0.0 FTBFS RHBZ#1192886).
+- Fix bogus %%changelog date.
+
+* Mon Aug 25 2014 Devrim Gündüz <devrim@gunduz.org> - 1.17.0-15
+- Rebuilt for libgeotiff
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Mar 04 2013 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-11
+- Applied upstream patches (25, 26) to ensure compatibility with ITK
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.17.0-9
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Wed Dec 05 2012 Dan Horák <dan[at]danny.cz> - 1.17.0-8
+- fix build on non-x86 arches
+
+* Sun Nov 25 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-7%{?dist}
+- Changed source0 path to point to vxl 1.17
+- Added missing sonames
+
+* Fri Nov 02 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-6%{?dist}
+- Patched to build BRL
+- Updated to last version
+
+* Mon Oct 29 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-5%{?dist}
+- Removed expatpp bundled library and added corresponding BR
+- Removed bundled bzip
+
+
+* Thu Oct 18 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-4%{?dist}
+- Fixed missing oxl_vrml lib
+- Turn on compilation of BRL
+
+* Sun Oct 14 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-3%{?dist}
+- More fixes from Volker's post https://bugzilla.redhat.com/show_bug.cgi?id=567086#c42
+
+* Wed Oct 10 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-2%{?dist}
+- Added patches 12-16 from https://bugzilla.redhat.com/show_bug.cgi?id=567086#c42
+- Minor rework of the spec file as pointed out by Volker in the previous link
+
+* Wed Oct 10 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-1%{?dist}
+- Updated to new version
+- Reworked patches to the new version
+- Disabled BRL because it gives a compilation error
+
+* Fri May 27 2011 Mario Ceresa mrceresa fedoraproject org vxl 1.14.0-1%{?dist}
+- Updated to new version
+- Added BR doxygen (thanks to Ankur for noticing it)
+- Changed patch naming schema
+- Work around a rply related bug (patches 3-6)
+- Thanks to Thomas Bouffon for patch 7-8
+- Patches 9-10 address http://www.itk.org/pipermail/insight-users/2010-July/037418.html
+- Fixed 70 missing sonames in patch 11
+- Removed bundled expact, shapelib, minizip, dcmtk
+- Force brl build
+- Use system shipped FindEXPAT
+
+
+* Tue Mar 23 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-4%{?dist}
+- sed patch to add ${LIB_SUFFIX} to all lib install target
+- Added soname version info to vil vil_algo lib
+
+* Sun Mar 21 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-3%{?dist}
+- Applied patch to build against newly packaged rply
+
+* Tue Mar 2 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-2%{?dist}
+- Applied patch from debian distribution to force the generation of versioned lib
+
+* Fri Feb 19 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-1%{?dist}
+- Initial RPM Release
+
+

licenses.txt

@@ -0,0 +1,245 @@
+# remove bits unbundled and removed in patches and run
+# licensecheck -r . | sed '/UNKNOWN/ d'
+
+# To get a list, run:
+# cat licenses.txt | grep -Ev "^#" | cut -d: -f2 | sort -u
+
+# additional notes on licenses below (also commented by starting line with #):
+
+./core/vxl_copyright.h: BSD 3-Clause License
+./vcl/vcl_atomic_count.h: Boost Software License 1.0
+./config/cmake/CodeCoverage.cmake: BSD 3-Clause License
+./core/vbl/vbl_checked_delete.h: NTP License
+./core/vbl/vbl_disjoint_sets.h: *No copyright* MIT License
+./core/vbl/vbl_scoped_ptr.h: NTP License
+./core/vul/vul_ios_state.h: Boost Software License 1.0
+./scripts/gitsetup/LICENSE: *No copyright* Apache License 2.0
+./scripts/gitsetup/README: *No copyright* Apache License 2.0
+./scripts/gitsetup/git-gerrit-push: Apache License 2.0
+./scripts/gitsetup/setup-gerrit: Apache License 2.0
+./scripts/gitsetup/setup-hooks: Apache License 2.0
+./scripts/gitsetup/setup-sourceforge: Apache License 2.0
+./scripts/gitsetup/setup-ssh: Apache License 2.0
+./scripts/gitsetup/setup-stage: Apache License 2.0
+./scripts/gitsetup/setup-user: Apache License 2.0
+./scripts/gitsetup/tips: Apache License 2.0
+./v3p/clipper/License.txt: *No copyright* Boost Software License 1.0
+./v3p/clipper/clipper.cpp: Boost Software License
+./v3p/clipper/clipper.hxx: Boost Software License
+./v3p/openjpeg2/bio.c: BSD 2-Clause License
+./v3p/openjpeg2/bio.h: BSD 2-Clause License
+./v3p/openjpeg2/cio.c: BSD 2-Clause License
+./v3p/openjpeg2/cio.h: BSD 2-Clause License
+./v3p/openjpeg2/dwt.c: BSD 2-Clause License
+./v3p/openjpeg2/dwt.h: BSD 2-Clause License
+./v3p/openjpeg2/event.c: BSD 2-Clause License
+./v3p/openjpeg2/event.h: BSD 2-Clause License
+./v3p/openjpeg2/fix.h: BSD 2-Clause License
+./v3p/openjpeg2/function_list.c: BSD 2-Clause License
+./v3p/openjpeg2/function_list.h: BSD 2-Clause License
+./v3p/openjpeg2/image.c: BSD 2-Clause License
+./v3p/openjpeg2/image.h: BSD 2-Clause License
+./v3p/openjpeg2/int.h: BSD 2-Clause License
+./v3p/openjpeg2/invert.c: BSD 2-Clause License
+./v3p/openjpeg2/invert.h: BSD 2-Clause License
+./v3p/openjpeg2/j2k.c: BSD 2-Clause License
+./v3p/openjpeg2/j2k.h: BSD 2-Clause License
+./v3p/openjpeg2/j2k_lib.c: BSD 2-Clause License
+./v3p/openjpeg2/j2k_lib.h: BSD 2-Clause License
+./v3p/openjpeg2/jp2.c: BSD 2-Clause License
+./v3p/openjpeg2/jp2.h: BSD 2-Clause License
+./v3p/openjpeg2/jpt.c: BSD 2-Clause License
+./v3p/openjpeg2/jpt.h: BSD 2-Clause License
+./v3p/openjpeg2/license.txt: BSD 2-Clause License
+./v3p/openjpeg2/mct.c: BSD 2-Clause License
+./v3p/openjpeg2/mct.h: BSD 2-Clause License
+./v3p/openjpeg2/mqc.c: BSD 2-Clause License
+./v3p/openjpeg2/mqc.h: BSD 2-Clause License
+./v3p/openjpeg2/openjpeg.c: BSD 2-Clause License
+./v3p/openjpeg2/openjpeg.h: BSD 2-Clause License
+./v3p/openjpeg2/opj_includes.h: BSD 2-Clause License
+./v3p/openjpeg2/opj_malloc.h: BSD 2-Clause License
+./v3p/openjpeg2/pi.c: BSD 2-Clause License
+./v3p/openjpeg2/pi.h: BSD 2-Clause License
+./v3p/openjpeg2/profile.c: BSD 2-Clause License
+./v3p/openjpeg2/profile.h: BSD 2-Clause License
+./v3p/openjpeg2/raw.c: BSD 2-Clause License
+./v3p/openjpeg2/raw.h: BSD 2-Clause License
+./v3p/openjpeg2/t1.c: BSD 2-Clause License
+./v3p/openjpeg2/t1.h: BSD 2-Clause License
+./v3p/openjpeg2/t2.c: BSD 2-Clause License
+./v3p/openjpeg2/t2.h: BSD 2-Clause License
+./v3p/openjpeg2/tcd.c: BSD 2-Clause License
+./v3p/openjpeg2/tcd.h: BSD 2-Clause License
+./v3p/openjpeg2/tgt.c: BSD 2-Clause License
+./v3p/openjpeg2/tgt.h: BSD 2-Clause License
+./vcl/internal/vcl_atomic_count_gcc.h: Boost Software License 1.0
+./vcl/internal/vcl_atomic_count_gcc_x86.h: Boost Software License 1.0
+./vcl/internal/vcl_atomic_count_pthreads.h: Boost Software License 1.0
+./vcl/internal/vcl_atomic_count_solaris.h: Boost Software License 1.0
+./vcl/internal/vcl_atomic_count_sync.h: Boost Software License 1.0
+./vcl/internal/vcl_atomic_count_win32.h: Boost Software License 1.0
+./vcl/internal/vcl_interlocked.h: Boost Software License 1.0
+./contrib/rpl/rgtl/CMakeLists.txt: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree_data_fixed.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree_index.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree_link.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree_node_data.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_compact_tree_policy.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_config.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_license_1_0.txt: *No copyright* Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_meta.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_array.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_array_points.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_array_points.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_array_triangles_3d.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_array_triangles_3d.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_closest_polygon_3d.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_once.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_object_once.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_cell_bounds.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_cell_bounds.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_cell_geometry.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_cell_geometry.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_cell_location.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_cell_location.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_data_fixed.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_data_fixed.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_dual.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_dual_element.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_dual_index.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_dual_location.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_dual_visit.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_objects.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_objects.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_point_location.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_octree_point_location.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_separating_axis.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_separating_axis_projection.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize.txt: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_access.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_base.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_direction.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_istream.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_istream.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_ostream.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_ostream.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_split.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_stl_vector.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_vnl_double_3.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_serialize_vnl_vector_fixed.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_base.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_base.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_cell_bounds.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_cell_bounds.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_cell_geometry.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_cell_geometry.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_cell_location.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_cell_location.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_object_array.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_object_array_triangles_3d.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_object_array_triangles_3d.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_objects.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_objects.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_space.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_sqt_space.hxx: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_static_assert.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_tagged_index.h: Boost Software License 1.0
+./contrib/rpl/rgtl/rgtl_tagged_vector.h: Boost Software License 1.0
+./contrib/rpl/rtvl/CMakeLists.txt: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_intpow.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_license_1_0.txt: *No copyright* Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_refine.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_refine.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_tensor.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_tensor.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_tensor_d.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_tensor_d.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_terms.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_tokens.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_vote.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_vote.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_votee.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_votee.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_votee_d.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_votee_d.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_voter.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_voter.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_weight.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_weight_original.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_weight_original.hxx: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_weight_smooth.h: Boost Software License 1.0
+./contrib/rpl/rtvl/rtvl_weight_smooth.hxx: Boost Software License 1.0
+./core/doc/book/chapter_vnl.texi: *No copyright* Public domain
+./core/vil/file_formats/viffheader.h.original: NTP License (legal disclaimer)
+./core/vil/file_formats/vil_viffheader.h: NTP License (legal disclaimer)
+./core/vil1/file_formats/vil1_viff_support.c: NTP License (legal disclaimer)
+./core/vil1/file_formats/vil1_viffheader.h: NTP License (legal disclaimer)
+./v3p/netlib/libf2c/Notice: Standard ML of New Jersey License
+./v3p/netlib/libf2c/arithchk.c: Standard ML of New Jersey License
+./v3p/netlib/linalg/lsmrBase.cxx: Apache License 2.0
+./v3p/netlib/linalg/lsmrBase.h: Apache License 2.0
+./v3p/netlib/linalg/lsmrDense.cxx: Apache License 2.0
+./v3p/netlib/linalg/lsmrDense.h: Apache License 2.0
+./v3p/netlib/linalg/lsqrBase.cxx: Apache License 2.0
+./v3p/netlib/linalg/lsqrBase.h: Apache License 2.0
+./v3p/netlib/linalg/lsqrDense.cxx: Apache License 2.0
+./v3p/netlib/linalg/lsqrDense.h: Apache License 2.0
+./v3p/netlib/tests/lsmrTest2.cxx: Apache License 2.0
+./v3p/netlib/tests/lsqrTest1.cxx: Apache License 2.0
+./v3p/netlib/tests/lsqrTest2.cxx: Apache License 2.0
+./v3p/netlib/tests/tricall.c: *No copyright* Public domain
+./contrib/brl/bbas/bjson/bjsoncpp.cxx: MIT License
+./contrib/brl/bbas/bjson/jsoncpp.cxx: MIT License
+./contrib/brl/bbas/bnabo/bnabo.cxx: BSD 3-Clause License
+./contrib/brl/bbas/bnabo/bnabo.h: BSD 3-Clause License
+./contrib/brl/bbas/bnabo/bnabo_brute_force.cxx: BSD 3-Clause License
+./contrib/brl/bbas/bnabo/bnabo_index_heap.h: BSD 3-Clause License
+./contrib/brl/bbas/bnabo/bnabo_kdd_tree.cxx: BSD 3-Clause License
+./contrib/brl/bbas/bnabo/bnabo_private.h: BSD 3-Clause License
+./contrib/mul/doc/book/atexinfo.tex: GNU General Public License v2.0 or later
+./contrib/rpl/rgtl/tests/CMakeLists.txt: Boost Software License 1.0
+./contrib/rpl/rgtl/tests/test_compact_tree_data_fixed.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/tests/test_driver.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/tests/test_octree_data_fixed.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/tests/test_octree_dual_visit.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/tests/test_octree_objects.cxx: Boost Software License 1.0
+./contrib/rpl/rgtl/tests/test_sqt_base.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_refine+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_refine+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_tensor+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_tensor+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_tensor_d+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_tensor_d+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_vote+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_vote+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_votee+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_votee+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_votee_d+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_votee_d+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_voter+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_voter+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_weight_original+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_weight_original+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_weight_smooth+2-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/Templates/rtvl_weight_smooth+3-.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/examples/rtvl_hello.cxx: Boost Software License 1.0
+./contrib/rpl/rtvl/examples/rtvl_saliency_image.cxx: Boost Software License 1.0
+./contrib/tbl/doc/book/atexinfo.tex: GNU General Public License v2.0 or later
+./v3p/dcmtk/ofstd/libsrc/ofstd.cxx: BSD 3-Clause License and/or NTP License
+
+./contrib/brl/bbas/bil/algo/bil_edt.h: *No copyright* GNU Lesser General Public License [generated file]
+# ^
+# Not under this license. The text says:
+# //  Implementation influenced by the LTI lib, which is licensed under LGPL:
+# //    http://ltilib.sourceforge.net
+
+./contrib/brl/bseg/boxm2/doc/book/atexinfo.tex: GNU General Public License v2.0 or later
+./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.cookie-min.js: MIT License
+./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.disabletextselect-min.js: MIT License
+./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.min.js: MIT License
+./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.mousewheel-min.js: MIT License
+./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.reel-min.js: MIT License
+./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/miniZoomPan.js: *No copyright* MIT License

sources

@@ -1 +1 @@
-99b44265df5a638b7757135cb4f10166  vxl-1.17.0-clean.tar.gz
+SHA512 (vxl-3.5.0-clean.tar.gz) = cb5eaf88e689216b9de56f9a9e07e2a6a8ce4469d0b990f847e8f1060b0a0d6e621ef128c9878a26cef8816b0efd7e99bcca8bc65a43e091f3650158425ebde9

vxl-0.17.0-gcc5.diff

@@ -1,13 +0,0 @@
---- vxl-git4e07960/vcl/vcl_compiler.h~	2012-11-02 12:08:21.000000000 +0100
-+++ vxl-git4e07960/vcl/vcl_compiler.h	2015-02-15 13:50:46.376329878 +0100
-@@ -119,6 +119,10 @@
- #  else
- #   define VCL_GCC_40
- #  endif
-+# elif (__GNUC__== 5)
-+// pretend GCC 5 to be GCC 4
-+#  define VCL_GCC_4
-+#  define VCL_GCC_41
- # else
- #  error "Dunno about this gcc"
- # endif

vxl-1.17.0-gcc6.patch

@@ -1,70 +0,0 @@
-diff -up vxl-git4e07960/core/vnl/io/CMakeLists.txt.gcc6 vxl-git4e07960/core/vnl/io/CMakeLists.txt
---- vxl-git4e07960/core/vnl/io/CMakeLists.txt.gcc6	2016-02-25 15:41:15.829447406 -0500
-+++ vxl-git4e07960/core/vnl/io/CMakeLists.txt	2016-02-25 15:41:29.558366867 -0500
-@@ -22,7 +22,7 @@ AUX_SOURCE_DIRECTORY(Templates vnl_io_so
- IF(CMAKE_COMPILER_IS_GNUCXX)
-   SET_SOURCE_FILES_PROPERTIES(Templates/vsl_vector_io+vcl_vector+vcl_vector+vnl_vector+double----.cxx
-                               PROPERTIES
--                              COMPILE_FLAGS -ftemplate-depth-35)
-+                              COMPILE_FLAGS -ftemplate-depth=70)
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- ADD_LIBRARY(vnl_io ${vnl_io_sources} )
-diff -up vxl-git4e07960/core/vul/vul_psfile.h.gcc6 vxl-git4e07960/core/vul/vul_psfile.h
---- vxl-git4e07960/core/vul/vul_psfile.h.gcc6	2012-11-02 07:08:21.000000000 -0400
-+++ vxl-git4e07960/core/vul/vul_psfile.h	2016-02-25 15:27:18.435360448 -0500
-@@ -37,7 +37,7 @@ class vul_psfile: public vcl_ofstream
- 
-   vul_psfile(char const* filename, bool debug_output=false);
-   ~vul_psfile();
--  operator bool() { return (void*)output_filestream!=(void*)0; }
-+  operator bool() { return reinterpret_cast<void*>(&output_filestream)!=(void*)0; }
- 
-   void set_paper_type(vul_psfile::paper_type type){printer_paper_type = type;}
-   void set_paper_layout(vul_psfile::paper_layout layout) {printer_paper_layout = layout;}
-diff -up vxl-git4e07960/vcl/vcl_compiler.h.gcc6 vxl-git4e07960/vcl/vcl_compiler.h
---- vxl-git4e07960/vcl/vcl_compiler.h.gcc6	2016-02-25 15:10:56.252121833 -0500
-+++ vxl-git4e07960/vcl/vcl_compiler.h	2016-02-25 15:10:56.254121822 -0500
-@@ -119,8 +119,8 @@
- #  else
- #   define VCL_GCC_40
- #  endif
--# elif (__GNUC__== 5)
--// pretend GCC 5 to be GCC 4
-+# elif (__GNUC__>5)
-+// pretend GCC 5+ to be GCC 4
- #  define VCL_GCC_4
- #  define VCL_GCC_41
- # else
-diff -up vxl-git4e07960/contrib/mul/tools/crop_image_2d.cxx.gcc6 vxl-git4e07960/contrib/mul/tools/crop_image_2d.cxx
---- vxl-git4e07960/contrib/mul/tools/crop_image_2d.cxx.gcc6	2016-02-25 16:34:20.892977826 -0500
-+++ vxl-git4e07960/contrib/mul/tools/crop_image_2d.cxx	2016-02-25 17:23:52.435971926 -0500
-@@ -15,6 +15,12 @@
- #include <vul/vul_string.h>
- #include <vgl/vgl_point_2d.h>
- 
-+// not at all sure this is right, but it gets this past gcc 6.
-+
-+vcl_ostream& operator <<( vcl_ostream &a, vcl_ostream &b) {
-+a << b;
-+return a;
-+}
- 
- //=========================================================================
- // Static function to create a static logger when first required
-diff -up vxl-git4e07960/contrib/mul/tools/crop_image_3d.cxx.gcc6 vxl-git4e07960/contrib/mul/tools/crop_image_3d.cxx
---- vxl-git4e07960/contrib/mul/tools/crop_image_3d.cxx.gcc6	2016-02-25 17:15:12.591046600 -0500
-+++ vxl-git4e07960/contrib/mul/tools/crop_image_3d.cxx	2016-02-25 17:24:15.283836790 -0500
-@@ -19,6 +19,12 @@
- #include <vgl/vgl_point_3d.h>
- #include <vgl/vgl_box_3d.h>
- 
-+// not at all sure this is right, but it gets this past gcc 6.
-+
-+vcl_ostream& operator <<( vcl_ostream &a, vcl_ostream &b) {
-+  a << b;
-+  return a;
-+}
- 
- //=========================================================================
- // Static function to create a static logger when first required

vxl-1.17.0-secondary.patch

@@ -1,30 +0,0 @@
-diff -up vxl-git4e07960/core/vil/vil_round.h.secondary vxl-git4e07960/core/vil/vil_round.h
---- vxl-git4e07960/core/vil/vil_round.h.secondary	2012-12-05 08:23:37.072384920 -0500
-+++ vxl-git4e07960/core/vil/vil_round.h	2012-12-05 08:24:06.682385737 -0500
-@@ -25,9 +25,8 @@
- # endif
- #endif
- 
--// Turn on fast impl when using GCC on Intel-based machines with the following exception:
--//   PPC with Mac OS X
--#if defined(__GNUC__) && (!defined(__APPLE__)  || !defined(__ppc__) )
-+// Turn on fast impl when using GCC on Intel-based machines
-+#if defined(__GNUC__) && (defined(__i386__)  || defined(__x86_64__) )
- # define GCC_USE_FAST_IMPL 1
- #else
- # define GCC_USE_FAST_IMPL 0
-diff -up vxl-git4e07960/core/vnl/vnl_math.h.secondary vxl-git4e07960/core/vnl/vnl_math.h
---- vxl-git4e07960/core/vnl/vnl_math.h.secondary	2012-12-05 08:12:25.282386747 -0500
-+++ vxl-git4e07960/core/vnl/vnl_math.h	2012-12-05 08:13:05.142387632 -0500
-@@ -53,9 +53,8 @@
- #   include <emmintrin.h> // sse 2 intrinsics
- # endif
- #endif
--// Turn on fast impl when using GCC on Intel-based machines with the following exception:
--//   PPC with Mac OS X
--#if defined(__GNUC__) && (!defined(__APPLE__)  || !defined(__ppc__) )
-+// Turn on fast impl when using GCC on Intel-based machines
-+#if defined(__GNUC__) && (defined(__i386__)  || defined(__x86_64__))
- # define GCC_USE_FAST_IMPL 1
- #else
- # define GCC_USE_FAST_IMPL 0

vxl_copyright.h

@@ -1,37 +0,0 @@
-#ifndef vxl_copyright_h_
-#define vxl_copyright_h_
-
-// <begin copyright notice>
-// ---------------------------------------------------------------------------
-//
-//                Copyright (c) 2000-2003 TargetJr Consortium
-//               GE Corporate Research and Development (GE CRD)
-//                             1 Research Circle
-//                            Niskayuna, NY 12309
-//                            All Rights Reserved
-//              Reproduction rights limited as described below.
-//
-//      Permission to use, copy, modify, distribute, and sell this software
-//      and its documentation for any purpose is hereby granted without fee,
-//      provided that (i) the above copyright notice and this permission
-//      notice appear in all copies of the software and related documentation,
-//      (ii) the name TargetJr Consortium (represented by GE CRD), may not be
-//      used in any advertising or publicity relating to the software without
-//      the specific, prior written permission of GE CRD, and (iii) any
-//      modifications are clearly marked and summarized in a change history
-//      log.
-//
-//      THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
-//      EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-//      WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-//      IN NO EVENT SHALL THE TARGETJR CONSORTIUM BE LIABLE FOR ANY SPECIAL,
-//      INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY
-//      DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-//      WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON
-//      ANY THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE
-//      USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// ---------------------------------------------------------------------------
-// <end copyright notice>
-
-#endif // vxl_copyright_h_