Merge branch 'release' into release-5.4

Author: thewtex

Modules/ThirdParty/VNL/UpdateFromUpstream.sh

@@ -28,6 +28,7 @@ extract_source () {
     git_archive
     pushd "${extractdir}/${name}-reduced"
     rm v3p/netlib/triangle*
+    rm -rf v3p/netlib/toms
     rm v3p/netlib/examples/showme.c
     echo "* -whitespace" > .gitattributes
     popd

Modules/ThirdParty/VNL/src/vxl/core/vnl/algo/CMakeLists.txt

@@ -74,7 +74,7 @@ if(NETLIB_FOUND)
     vnl_brent_minimizer.cxx vnl_brent_minimizer.h
 
     # equation solvers
-    vnl_rpoly_roots.cxx vnl_rpoly_roots.h
+    # vnl_rpoly_roots.cxx vnl_rpoly_roots.h Remove for ACM Copyright
     vnl_cpoly_roots.cxx vnl_cpoly_roots.h
     vnl_rnpoly_solve.cxx vnl_rnpoly_solve.h
     vnl_fit_parabola.h

Modules/ThirdParty/VNL/src/vxl/core/vnl/algo/tests/CMakeLists.txt

@@ -36,7 +36,7 @@ if(NETLIB_FOUND)
     test_rank.cxx
     test_real_eigensystem.cxx
     test_rnpoly_roots.cxx
-    test_rpoly_roots.cxx
+    # test_rpoly_roots.cxx  Remove due to ACM Copyright
     test_sparse_matrix.cxx
     test_svd.cxx
     test_svd_fixed.cxx
@@ -74,7 +74,7 @@ if(NETLIB_FOUND)
   add_test( NAME vnl_algo_test_rank COMMAND vnl_algo_test_all test_rank                    )
   add_test( NAME vnl_algo_test_real_eigensystem COMMAND vnl_algo_test_all test_real_eigensystem        )
   add_test( NAME vnl_algo_test_rnpoly_roots COMMAND vnl_algo_test_all test_rnpoly_roots            )
-  add_test( NAME vnl_algo_test_rpoly_roots COMMAND vnl_algo_test_all test_rpoly_roots             )
+  # add_test( NAME vnl_algo_test_rpoly_roots COMMAND vnl_algo_test_all test_rpoly_roots             )
   add_test( NAME vnl_algo_test_integral COMMAND vnl_algo_test_all test_integral                )
   add_test( NAME vnl_algo_test_solve_qp COMMAND vnl_algo_test_all test_solve_qp                )
   add_test( NAME vnl_algo_test_sparse_lu COMMAND vnl_algo_test_all test_sparse_lu               )

Modules/ThirdParty/VNL/src/vxl/core/vnl/algo/tests/test_driver.cxx

@@ -61,7 +61,7 @@ register_tests()
   REGISTER(test_real_eigensystem);
   REGISTER(test_integral);
   REGISTER(test_rnpoly_roots);
-  REGISTER(test_rpoly_roots);
+  // REGISTER(test_rpoly_roots);
   REGISTER(test_sparse_matrix);
   REGISTER(test_svd);
   REGISTER(test_svd_fixed);

Modules/ThirdParty/VNL/src/vxl/v3p/netlib/CMakeLists.txt

@@ -407,7 +407,6 @@ set(v3p_netlib_sources
      ${V3P_NETLIB_minpack_SOURCES}
      ${V3P_NETLIB_opt_SOURCES}
      ${V3P_NETLIB_linalg_SOURCES}
-     ${V3P_NETLIB_toms_SOURCES}
      ${V3P_NETLIB_datapac_SOURCES}
      ${V3P_NETLIB_mathews_SOURCES}
      ${V3P_NETLIB_sparse_SOURCES}