[med-svn] r11384 - in trunk/packages/vxl/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Tue Jun 19 10:17:11 UTC 2012
Author: malat
Date: 2012-06-19 10:17:11 +0000 (Tue, 19 Jun 2012)
New Revision: 11384
Added:
trunk/packages/vxl/trunk/debian/patches/dcmtkgcc47.patch
trunk/packages/vxl/trunk/debian/patches/gcc47other.patch
trunk/packages/vxl/trunk/debian/patches/vnl_r28976.patch
Removed:
trunk/packages/vxl/trunk/debian/patches/bits.patch
trunk/packages/vxl/trunk/debian/patches/fixosl.patch
Modified:
trunk/packages/vxl/trunk/debian/changelog
trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch
trunk/packages/vxl/trunk/debian/patches/install_doxygen.patch
trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
trunk/packages/vxl/trunk/debian/patches/series
trunk/packages/vxl/trunk/debian/patches/sse2.patch
trunk/packages/vxl/trunk/debian/patches/vxl.soname.patch
Log:
vxl 1.14 compiles with gcc 4.7
Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog 2012-06-19 08:41:23 UTC (rev 11383)
+++ trunk/packages/vxl/trunk/debian/changelog 2012-06-19 10:17:11 UTC (rev 11384)
@@ -1,3 +1,9 @@
+vxl (1.14.0-18) UNRELEASED; urgency=low
+
+ * Fix compilation with gcc 4.7. Closes: #674350
+
+ -- Mathieu Malaterre <malat at debian.org> Tue, 19 Jun 2012 10:42:27 +0200
+
vxl (1.14.0-17) unstable; urgency=low
* Disable test suite for now
Deleted: trunk/packages/vxl/trunk/debian/patches/bits.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/bits.patch 2012-06-19 08:41:23 UTC (rev 11383)
+++ trunk/packages/vxl/trunk/debian/patches/bits.patch 2012-06-19 10:17:11 UTC (rev 11384)
@@ -1,74 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- vxl (1.17.0-1) UNRELEASED; urgency=low
- .
- * New upstream
-Author: Mathieu Malaterre <malat at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
-@@ -36,10 +36,10 @@ IF(EXPAT_FOUND)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl/pro ${bmdl_pro_sources})
-
- TARGET_LINK_LIBRARIES(bmdl_pro bmdl bprb vil vil_io vpgl_file_formats vgl_io
-- vsol brip vpgl_pro vgl vul vpl imesh_algo minizip)
-+ vsol brip vpgl_pro vgl vul vpl imesh_algo b3p_minizip)
-
- IF(ZLIB_FOUND)
-- TARGET_LINK_LIBRARIES( bmdl_pro minizip )
-+ TARGET_LINK_LIBRARIES( bmdl_pro b3p_minizip )
- ENDIF(ZLIB_FOUND)
-
- IF( BUILD_TESTING )
---- vxl-1.17.0.orig/contrib/oxl/osl/tests/CMakeLists.txt
-+++ vxl-1.17.0/contrib/oxl/osl/tests/CMakeLists.txt
-@@ -1,4 +1,4 @@
- ADD_EXECUTABLE( osl_test_include test_include.cxx )
--TARGET_LINK_LIBRARIES( osl_test_include osl )
-+TARGET_LINK_LIBRARIES( osl_test_include oxl_osl )
- ADD_EXECUTABLE( osl_test_template_include test_template_include.cxx )
--TARGET_LINK_LIBRARIES( osl_test_template_include osl )
-+TARGET_LINK_LIBRARIES( osl_test_template_include oxl_osl )
---- vxl-1.17.0.orig/contrib/mul/msm/CMakeLists.txt
-+++ vxl-1.17.0/contrib/mul/msm/CMakeLists.txt
-@@ -38,7 +38,7 @@ SET(msm_sources
-
- AUX_SOURCE_DIRECTORY(Templates msm_sources)
- ADD_LIBRARY(msm ${msm_sources} )
--TARGET_LINK_LIBRARIES(msm mcal vimt vnl_algo vnl_io vnl vgl vul vsl)
-+TARGET_LINK_LIBRARIES(msm mul_mcal vimt vnl_algo vnl_io vnl vgl vul vsl)
-
- SUBDIRS(utils)
- SUBDIRS(tools)
---- vxl-1.17.0.orig/contrib/mul/mcal/CMakeLists.txt
-+++ vxl-1.17.0/contrib/mul/mcal/CMakeLists.txt
-@@ -20,8 +20,9 @@ SET(mcal_sources
- )
- AUX_SOURCE_DIRECTORY(Templates mcal_sources)
-
--ADD_LIBRARY(mcal ${mcal_sources})
--TARGET_LINK_LIBRARIES(mcal mbl vnl vnl_algo vnl_io vul)
-+ADD_LIBRARY(mul_mcal ${mcal_sources})
-+TARGET_LINK_LIBRARIES(mul_mcal mbl vnl vnl_algo vnl_io vul)
-+INSTALL_TARGETS(/lib mul_mcal)
-
- IF (BUILD_TESTING)
- SUBDIRS(tests)
Added: trunk/packages/vxl/trunk/debian/patches/dcmtkgcc47.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/dcmtkgcc47.patch (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/dcmtkgcc47.patch 2012-06-19 10:17:11 UTC (rev 11384)
@@ -0,0 +1,110 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vxl (1.14.0-18) UNRELEASED; urgency=low
+ .
+ * Fix compilation with gcc 4.7. Closes: #674350
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/674350
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vxl-1.14.0.orig/v3p/dcmtk/dcmimgle/include/dimoflt.h
++++ vxl-1.14.0/v3p/dcmtk/dcmimgle/include/dimoflt.h
+@@ -105,11 +105,11 @@ class DiMonoFlipTemplate
+ if (this->Data != NULL)
+ {
+ if (horz && vert)
+- flipHorzVert(&pixel, &this->Data);
++ DiFlipTemplate<T>::flipHorzVert(&pixel, &this->Data);
+ else if (horz)
+- flipHorz(&pixel, &this->Data);
++ DiFlipTemplate<T>::flipHorz(&pixel, &this->Data);
+ else if (vert)
+- flipVert(&pixel, &this->Data);
++ DiFlipTemplate<T>::flipVert(&pixel, &this->Data);
+ }
+ }
+ }
+--- vxl-1.14.0.orig/v3p/dcmtk/dcmimgle/include/diflipt.h
++++ vxl-1.14.0/v3p/dcmtk/dcmimgle/include/diflipt.h
+@@ -130,7 +130,7 @@ class DiFlipTemplate
+ else if (vert)
+ flipVert(src, dest);
+ else
+- copyPixel(src, dest);
++ DiTransTemplate<T>::copyPixel(src, dest);
+ }
+ }
+
+--- vxl-1.14.0.orig/v3p/dcmtk/dcmimgle/include/dimosct.h
++++ vxl-1.14.0/v3p/dcmtk/dcmimgle/include/dimosct.h
+@@ -121,7 +121,7 @@ class DiMonoScaleTemplate
+ {
+ const T value = (T)((double)DicomImageClass::maxval(bits) * (double)pvalue /
+ (double)DicomImageClass::maxval(WIDTH_OF_PVALUES));
+- scaleData(&pixel, &this->Data, interpolate, value);
++ DiScaleTemplate<T>::scaleData(&pixel, &this->Data, interpolate, value);
+ }
+ }
+ }
+--- vxl-1.14.0.orig/v3p/dcmtk/dcmimgle/include/dirotat.h
++++ vxl-1.14.0/v3p/dcmtk/dcmimgle/include/dirotat.h
+@@ -132,7 +132,7 @@ class DiRotateTemplate
+ else if (degree == 270)
+ rotateLeft(src, dest);
+ else
+- copyPixel(src, dest);
++ DiTransTemplate<T>::copyPixel(src, dest);
+ }
+
+
+--- vxl-1.14.0.orig/v3p/dcmtk/dcmimgle/include/dimorot.h
++++ vxl-1.14.0/v3p/dcmtk/dcmimgle/include/dimorot.h
+@@ -105,11 +105,11 @@ class DiMonoRotateTemplate
+ if (this->Data != NULL)
+ {
+ if (degree == 90)
+- rotateRight(&pixel, &this->Data);
++ DiRotateTemplate<T>::rotateRight(&pixel, &this->Data);
+ else if (degree == 180)
+- rotateTopDown(&pixel, &this->Data);
++ DiRotateTemplate<T>::rotateTopDown(&pixel, &this->Data);
+ else if (degree == 270)
+- rotateLeft(&pixel, &this->Data);
++ DiRotateTemplate<T>::rotateLeft(&pixel, &this->Data);
+ }
+ }
+ }
+--- vxl-1.14.0.orig/v3p/dcmtk/dcmimgle/include/discalet.h
++++ vxl-1.14.0/v3p/dcmtk/dcmimgle/include/discalet.h
+@@ -188,12 +188,12 @@ class DiScaleTemplate
+ ofConsole.unlockCerr();
+ }
+ #endif
+- fillPixel(dest, value); // ... fill bitmap
++ DiTransTemplate<T>::fillPixel(dest, value); // ... fill bitmap
+ }
+ else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y)) // no scaling
+ {
+ if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y))
+- copyPixel(src, dest); // copying
++ DiTransTemplate<T>::copyPixel(src, dest); // copying
+ else if ((Left >= 0) && ((Uint16)(Left + this->Src_X) <= Columns) &&
+ (Top >= 0) && ((Uint16)(Top + this->Src_Y) <= Rows))
+ clipPixel(src, dest); // clipping
Modified: trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch 2012-06-19 08:41:23 UTC (rev 11383)
+++ trunk/packages/vxl/trunk/debian/patches/ffmpeg_C99.patch 2012-06-19 10:17:11 UTC (rev 11384)
@@ -4,10 +4,24 @@
Author: Chuck Atkins <chuck.atkins at kitware.com>
Last-Update: 2012-12-20
-Index: vxl-1.17.0/core/vidl/tests/test_include.cxx
+Index: vxl-1.14.0/core/vidl/vidl_ffmpeg_convert.h
===================================================================
---- vxl-1.17.0.orig/core/vidl/tests/test_include.cxx 2011-03-15 15:57:23.000000000 +0000
-+++ vxl-1.17.0/core/vidl/tests/test_include.cxx 2012-06-05 16:54:50.444824072 +0000
+--- vxl-1.14.0.orig/core/vidl/vidl_ffmpeg_convert.h 2012-05-05 21:35:57.200911870 +0200
++++ vxl-1.14.0/core/vidl/vidl_ffmpeg_convert.h 2012-05-05 21:36:06.496911537 +0200
+@@ -18,6 +18,9 @@
+ #include <vidl/vidl_config.h>
+ extern "C" {
+ #if FFMPEG_IN_SEVERAL_DIRECTORIES
++#ifndef __STDC_CONSTANT_MACROS
++# define __STDC_CONSTANT_MACROS
++#endif
+ #include <libavcodec/avcodec.h>
+ #else
+ #include <ffmpeg/avcodec.h>
+Index: vxl-1.14.0/core/vidl/tests/test_include.cxx
+===================================================================
+--- vxl-1.14.0.orig/core/vidl/tests/test_include.cxx 2012-05-05 21:36:16.528911175 +0200
++++ vxl-1.14.0/core/vidl/tests/test_include.cxx 2012-05-05 21:36:21.596910990 +0200
@@ -1,3 +1,4 @@
+#define __STDC_CONSTANT_MACROS
#include <vidl/vidl_config.h> // needed for VIDL_HAS_FFMPEG etc.
Deleted: trunk/packages/vxl/trunk/debian/patches/fixosl.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/fixosl.patch 2012-06-19 08:41:23 UTC (rev 11383)
+++ trunk/packages/vxl/trunk/debian/patches/fixosl.patch 2012-06-19 10:17:11 UTC (rev 11384)
@@ -1,44 +0,0 @@
-Index: vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt
-===================================================================
---- vxl-1.17.0.orig/contrib/gel/vmal/CMakeLists.txt 2012-06-06 07:44:51.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt 2012-06-06 07:44:58.308086711 +0000
-@@ -42,7 +42,7 @@
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vmal ${vmal_sources})
-
- IF(BUILD_OXL)
-- TARGET_LINK_LIBRARIES(vmal mvl osl vil)
-+ TARGET_LINK_LIBRARIES(vmal mvl oxl_osl vil)
- ENDIF(BUILD_OXL)
-
- IF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
-Index: vxl-1.17.0/contrib/mul/mcal/tests/CMakeLists.txt
-===================================================================
---- vxl-1.17.0.orig/contrib/mul/mcal/tests/CMakeLists.txt 2012-06-06 07:44:53.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/mcal/tests/CMakeLists.txt 2012-06-06 07:44:58.308086711 +0000
-@@ -6,11 +6,11 @@
- test_trivial_ca.cxx
- test_general_ca.cxx
- )
--TARGET_LINK_LIBRARIES( mcal_test_all mul_mcal vnl testlib )
-+TARGET_LINK_LIBRARIES( mcal_test_all mul_mcal vnl vnl_algo vsl testlib )
-
- ADD_TEST( mcal_test_pca ${EXECUTABLE_OUTPUT_PATH}/mcal_test_all test_pca)
- ADD_TEST( mcal_test_trivial_ca ${EXECUTABLE_OUTPUT_PATH}/mcal_test_all test_trivial_ca)
- ADD_TEST( mcal_test_general_ca ${EXECUTABLE_OUTPUT_PATH}/mcal_test_all test_general_ca)
-
- ADD_EXECUTABLE( mcal_test_include test_include.cxx )
--TARGET_LINK_LIBRARIES( mcal_test_include mul_mcal )
-+TARGET_LINK_LIBRARIES( mcal_test_include mul_mcal vnl_algo)
-Index: vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx
-===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/baio/baio_unix.cxx 2010-11-22 16:11:21.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx 2012-06-06 07:46:51.784085147 +0000
-@@ -11,7 +11,7 @@
- #include <aio.h> //for aio_read
- //#include <fcntl.h> // for open (not really necessary
- #include <strings.h> //includes bzero
--
-+#include <unistd.h> //close
-
- //: baio_info struct: wrapper for status variables
- struct baio_info {
Added: trunk/packages/vxl/trunk/debian/patches/gcc47other.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/gcc47other.patch (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/gcc47other.patch 2012-06-19 10:17:11 UTC (rev 11384)
@@ -0,0 +1,793 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vxl (1.14.0-18) UNRELEASED; urgency=low
+ .
+ * Fix compilation with gcc 4.7. Closes: #674350
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/674350
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vxl-1.14.0.orig/core/vpdl/vpdl_kernel_base.h
++++ vxl-1.14.0/core/vpdl/vpdl_kernel_base.h
+@@ -13,6 +13,7 @@
+ // \endverbatim
+
+ #include <vpdl/vpdl_multi_cmp_dist.h>
++#include <vpdl/vpdt/vpdt_access.h> // function vpdt_size(v)
+ #include <vcl_cassert.h>
+ #include <vcl_vector.h>
+
+--- vxl-1.14.0.orig/core/vpdl/vpdt/vpdt_update_mog.h
++++ vxl-1.14.0/core/vpdl/vpdt/vpdt_update_mog.h
+@@ -124,7 +124,7 @@ class vpdt_mog_sg_updater : public vpdt_
+ void update( mog_type& mix, const F& sample, T alpha ) const
+ {
+ T sqr_dist;
+- unsigned int i = match(mix,sample,gt2_,sqr_dist);
++ unsigned int i = vpdt_mog_updater<mog_type>::match(mix,sample,gt2_,sqr_dist);
+ if (i<mix.num_components())
+ {
+ gaussian_type& g = mix.distribution(i);
+@@ -141,7 +141,7 @@ class vpdt_mog_sg_updater : public vpdt_
+ }
+ else
+ {
+- insert(mix,sample,init_weight_);
++ vpdt_mog_updater<mog_type>::insert(mix,sample,init_weight_);
+ }
+ mix.sort(vpdt_mog_fitness<gaussian_type>::order);
+ }
+--- vxl-1.14.0.orig/core/vidl/vidl_v4l2_device.cxx
++++ vxl-1.14.0/core/vidl/vidl_v4l2_device.cxx
+@@ -19,6 +19,7 @@ extern "C" {
+ #include <vcl_cerrno.h>
+ #include <fcntl.h>
+ };
++#include <unistd.h>
+
+ #include <vcl_cstring.h>
+ #include <vcl_cstdlib.h>
+--- vxl-1.14.0.orig/core/examples/vnl_calc/vnl_calc.cxx
++++ vxl-1.14.0/core/examples/vnl_calc/vnl_calc.cxx
+@@ -33,7 +33,7 @@ template <class T>
+ class mystack : public vcl_vector<T>
+ {
+ public:
+- void push(const T& t) { push_back(t); }
++ void push(const T& t) { vcl_vector<T>::push_back(t); }
+
+ T pop() {
+ int n = this->size();
+@@ -102,51 +102,53 @@ int main(int argc, char ** argv)
+ }
+ else if (arg == "+") {
+ POP2(a+b);
+- } else if (arg == "-") {
++ }
++ else if (arg == "-") {
+ POP2(a-b);
+- } else if (arg == "*" || arg == "x") {
++ }
++ else if (arg == "*" || arg == "x") {
+ POP2(a*b);
+- } else if (arg == "/") {
+-
++ }
++ else if (arg == "/") {
+ POP2(element_quotient(a,b));
+-
+- } else if (arg == "svd") {
++ }
++ else if (arg == "svd") {
+ Matrix a = stack.pop();
+ vnl_svd<double> svd(a);
+ stack.push(svd.U());
+ stack.push(svd.W().asMatrix());
+ stack.push(svd.V());
+-
+- } else if (arg == "X" || arg == "allx") {
++ }
++ else if (arg == "X" || arg == "allx") {
+ // Multiply everything
+ Matrix out = stack[0];
+ for (unsigned k = 1; k < stack.size(); ++k)
+ out = out * stack[k];
+ stack.clear();
+ stack.push(out);
+-
+- } else if (arg == "all+") {
++ }
++ else if (arg == "all+") {
+ // Add everything
+ Matrix out = stack[0];
+ for (unsigned k = 1; k < stack.size(); ++k)
+ out += stack[k];
+ stack.clear();
+ stack.push(out);
+-
+- } else if (arg == "i") {
++ }
++ else if (arg == "i") {
+ stack.push(vnl_svd<double>(stack.pop()).inverse());
+-
+- // Printing:
+- } else if (arg == "p") {
++ }
++ // Printing:
++ else if (arg == "p") {
+ //stack.print();
+ print(stack, print_format);
+-
+- } else if (arg == "fmt") {
++ }
++ else if (arg == "fmt") {
+ SHIFT;
+ //Matrix::set_print_format(arg.c_str());
+ print_format = arg;
+-
+- } else if (arg == "setp") {
++ }
++ else if (arg == "setp") {
+ Matrix a = stack.pop();
+ cout_precision = int(a(0,0));
+ if (cout_precision > 99 || cout_precision < 0)
+@@ -156,7 +158,8 @@ int main(int argc, char ** argv)
+ t[5]=char('0'+cout_precision%10);
+ //Matrix::set_print_format(t);
+ print_format = t;
+- } else { // Load from file
++ }
++ else { // Load from file
+ Matrix m;
+ vcl_ifstream f(arg.c_str());
+ if (!m.read_ascii(f)) {
+--- vxl-1.14.0.orig/contrib/prip/vpyr/vpyr_2_tpyramid_level_elts.h
++++ vxl-1.14.0/contrib/prip/vpyr/vpyr_2_tpyramid_level_elts.h
+@@ -179,7 +179,7 @@ class vpyr_2_tpyramid_level_element_iter
+ vpyr_2_tpyramid_level_element_iterator(It arg,vmap_level_index l)
+ :it_(arg)
+ {
+- set(*arg,l) ;
++ this->set(*arg,l) ;
+ }
+
+ //:
+--- vxl-1.14.0.orig/contrib/prip/vpyr/vpyr_2_pyramid_level_elts.h
++++ vxl-1.14.0/contrib/prip/vpyr/vpyr_2_pyramid_level_elts.h
+@@ -144,7 +144,7 @@ class vpyr_2_pyramid_level_dart_base_ite
+ vpyr_2_pyramid_level_dart_base_iterator(const vpyr_2_pyramid_level_dart_base_iterator<FDp,Refp,Ptrp,Itp> &it)
+ :it_((It)it.reference())
+ {
+- set(*it_, it.level()) ;
++ this->set(*it_, it.level()) ;
+ }
+
+ //:
+@@ -152,7 +152,7 @@ class vpyr_2_pyramid_level_dart_base_ite
+ self_type & operator=(const vpyr_2_pyramid_level_dart_base_iterator<FDp,Refp,Ptrp,Itp> &it)
+ {
+ it_=(It)it.reference() ;
+- set(*it_, it.level()) ;
++ this->set(*it_, it.level()) ;
+ return *this ;
+ }
+
+@@ -267,7 +267,7 @@ class vpyr_2_pyramid_level_dart_base_ite
+ vpyr_2_pyramid_level_dart_base_iterator(It arg,vmap_level_index l)
+ :it_(arg)
+ {
+- set(*arg,l) ;
++ this->set(*arg,l) ;
+ }
+
+ //:
+--- vxl-1.14.0.orig/contrib/prip/vmap/vmap_ptr_sequences.h
++++ vxl-1.14.0/contrib/prip/vmap/vmap_ptr_sequences.h
+@@ -292,7 +292,7 @@ class vmap_owning_sequence: public vmap_
+ {
+ clear() ;
+ storage_.resize(arg_size) ;
+- set_begin(new pointer[arg_size]) ;
++ this->set_begin(new pointer[arg_size]) ;
+ vmap_ptr_sequence<D>::resize(arg_size) ;
+
+ for (int i=0; i<arg_size; ++i)
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_monadic.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_monadic.txx
+@@ -9,10 +9,10 @@ bool vipl_monadic <ImgIn,ImgOut,DataIn,D
+ const ImgIn &in = this->in_data();
+ ImgOut &out = this->out_data();
+
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (int j = starty; j < stopy; ++j)
+ for (int i = startx; i < stopx; ++i)
+ fsetpixel(out, i, j, func()(fgetpixel(in, i, j, DataIn(0))));
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_dilate_disk.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_dilate_disk.txx
+@@ -12,10 +12,10 @@ bool vipl_dilate_disk <ImgIn,ImgOut,Data
+ int size = (radius() < 0) ? 0 : int(radius());
+ // mask is filled in preop function
+ // apply filter:
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (register int j = starty, ej = stopy; j < ej ; ++j)
+ for (register int i = startx, ei = stopx; i < ei ; ++i)
+ {
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_gradient_mag.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_gradient_mag.txx
+@@ -11,10 +11,10 @@ bool vipl_gradient_mag <ImgIn,ImgOut,Dat
+ ImgOut &out = *this->out_data_ptr();
+
+ register double dx, dy;
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (int j = starty; j < stopy; ++j)
+ for (int i = startx; i < stopx; ++i) {
+ dx = fgetpixel(in, i, j, DataIn(0)) - getpixel(in, i-1, j, DataIn(0));
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_x_gradient.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_x_gradient.txx
+@@ -9,10 +9,10 @@ bool vipl_x_gradient <ImgIn,ImgOut,DataI
+ const ImgIn &in = this->in_data(0);
+ ImgOut &out = *this->out_data_ptr();
+
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (register int j = starty; j < stopy; ++j)
+ for (register int i = startx+1; i < stopx; ++i) {
+ DataIn w = fgetpixel(in, i, j, DataIn(0))
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_gradient_dir.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_gradient_dir.txx
+@@ -10,10 +10,10 @@ bool vipl_gradient_dir <ImgIn,ImgOut,Dat
+ const ImgIn &in = this->in_data(0);
+ ImgOut &out = *this->out_data_ptr();
+
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (int j = starty; j < stopy; ++j)
+ for (int i = startx; i < stopx; ++i) {
+ register double dx = fgetpixel(in, i, j, DataIn(0)) - getpixel(in, i-1, j, DataIn(0));
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_moment.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_moment.txx
+@@ -46,10 +46,10 @@ bool vipl_moment <ImgIn,ImgOut,DataIn,Da
+
+ // We create a (double) float buffer to hold the computed values.
+
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+
+ int sizex = stopx-startx+1;
+ int sizey = stopy-starty+1;
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_sobel.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_sobel.txx
+@@ -9,10 +9,10 @@ bool vipl_sobel <ImgIn,ImgOut,DataIn,Dat
+ const ImgIn &in = this->in_data(0);
+ ImgOut &out = this->out_data();
+ // apply filter:
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (int j = starty, ej = stopy; j < ej ; ++j)
+ for (int i = startx, ei = stopx; i < ei ; ++i)
+ fsetpixel(out, i, j, (DataOut)(
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_erode_disk.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_erode_disk.txx
+@@ -21,10 +21,10 @@ bool vipl_erode_disk <ImgIn,ImgOut,DataI
+ #ifdef DEBUG
+ vcl_cout << " set start & stop ...";
+ #endif
+- int startx = start(this->X_Axis());
+- int starty = 0; // = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis()); // = height(out);
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = 0; // = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis()); // = height(out);
+ #ifdef DEBUG
+ vcl_cout << " (" << startx << ':' << stopx << ',' << starty << ':' << stopy << ')';
+ vcl_cout << " run over image ...";
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_gaussian_convolution.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_gaussian_convolution.txx
+@@ -12,21 +12,23 @@ bool vipl_gaussian_convolution <ImgIn,Im
+ int size = masksize();
+
+ // Make temporary buffer to hold result of first (horizontal) convolution
+- int width = stop(this->X_Axis()) - start(this->X_Axis());
+- int height = stop(this->Y_Axis()) - start(this->Y_Axis());
++ int width = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis())
++ - vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int height = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis())
++ - vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
+ double* buf = new double[width*height];
+ if (!buf) return false; // memory allocation failed
+
+ // 1-D mask was generated in preop(), we just use it here:
+
+ // horizontal convolution:
+- int starty = start(this->Y_Axis());
+- int stopy = stop(this->Y_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (int j = starty; j < stopy; ++j)
+ {
+ int buf_j = j - starty;
+- int startx = start(this->X_Axis(),j);
+- int stopx = stop(this->X_Axis(),j);
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis(),j);
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis(),j);
+ for (int i = startx; i < stopx; ++i) {
+ int buf_i = i - startx;
+ double result = mask()[0] * fgetpixel(in, i, j, DataIn(0));
+@@ -39,8 +41,8 @@ bool vipl_gaussian_convolution <ImgIn,Im
+ for (int j = starty; j < stopy; ++j)
+ {
+ int buf_j = j - starty;
+- int startx = start(this->X_Axis(),j);
+- int stopx = stop(this->X_Axis(),j);
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis(),j);
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis(),j);
+ for (int i = startx; i < stopx; ++i) {
+ int buf_i = i - startx;
+ double result = mask()[0] * buf[buf_i+width*buf_j];
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_convert.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_convert.txx
+@@ -14,10 +14,10 @@ bool vipl_convert <ImgIn,ImgOut,DataIn,D
+ const ImgIn &in = this->in_data(0);
+ ImgOut &out = this->out_data(0);
+
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (int j = starty; j < stopy; ++j)
+ for (int i = startx; i < stopx; ++i)
+ fsetpixel(out, i, j, (DataOut)fgetpixel(in,i,j,DataIn(0)));
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_y_gradient.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_y_gradient.txx
+@@ -9,10 +9,10 @@ bool vipl_y_gradient <ImgIn,ImgOut,DataI
+ const ImgIn &in = this->in_data(0);
+ ImgOut &out = *this->out_data_ptr();
+
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (register int j = starty+1; j < stopy; ++j)
+ for (register int i = startx; i < stopx; ++i) {
+ DataIn w = fgetpixel(in, i, j, DataIn(0))
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_add_random_noise.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_add_random_noise.txx
+@@ -7,10 +7,10 @@
+ template <class ImgIn,class ImgOut,class DataIn,class DataOut,class PixelItr>
+ bool vipl_add_random_noise <ImgIn,ImgOut,DataIn,DataOut,PixelItr> :: section_applyop()
+ {
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (register int j = starty; j < stopy; ++j)
+ for (register int i = startx; i < stopx; ++i)
+ {
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_threshold.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_threshold.txx
+@@ -9,10 +9,10 @@ bool vipl_threshold <ImgIn,ImgOut,DataIn
+ const ImgIn &in = this->in_data();
+ ImgOut &out = this->out_data();
+
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (int j = starty; j < stopy; ++j)
+ for (int i = startx; i < stopx; ++i) {
+ DataIn p = fgetpixel(in, i, j, DataIn(0));
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_median.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_median.txx
+@@ -14,10 +14,10 @@ bool vipl_median <ImgIn,ImgOut,DataIn,Da
+
+ // apply filter:
+ DataIn* v = new DataIn[(2*size+1)*(2*size+1)];
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (int j = starty; j < stopy; ++j)
+ for (int i = startx; i < stopx; ++i) {
+ register int count = 0;
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_dyadic.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_dyadic.txx
+@@ -9,10 +9,10 @@ bool vipl_dyadic <ImgIn,ImgOut,DataIn,Da
+ const ImgIn &in = this->in_data();
+ ImgOut &out = this->out_data();
+
+- int startx = start(this->X_Axis());
+- int starty = start(this->Y_Axis());
+- int stopx = stop(this->X_Axis());
+- int stopy = stop(this->Y_Axis());
++ int startx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis());
++ int starty = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis());
++ int stopx = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis());
++ int stopy = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis());
+ for (int j = starty; j < stopy; ++j)
+ for (int i = startx; i < stopx; ++i) {
+ DataIn p = fgetpixel(in, i, j, DataIn(0));
+--- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_histogram.txx
++++ vxl-1.14.0/contrib/tbl/vipl/vipl_histogram.txx
+@@ -14,8 +14,10 @@ bool vipl_histogram <ImgIn,ImgOut,DataIn
+ if (index < 0) index = 0;
+ #endif
+ if (checkrange() == 1) { // check range is slow, we always keep the divide...
+- for (int j = start(this->Y_Axis()), ej = stop(this->Y_Axis()) ; j < ej ; ++j)
+- for (int i = start(this->X_Axis(),j), ei = stop(this->X_Axis(),j) ; i < ei ; ++i) {
++ for (int j = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis()),
++ ej = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis()) ; j < ej ; ++j)
++ for (int i = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis(),j),
++ ei = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis(),j) ; i < ei ; ++i) {
+ long bin = long(0.5 + (shiftin()+getpixel(in,i,j,DataIn(0)))/scalein());
+ #if 0
+ if (bin < 0) bin = 0;
+@@ -26,22 +28,30 @@ bool vipl_histogram <ImgIn,ImgOut,DataIn
+ }
+ } // else we want speed, skip safety check, check special cases
+ else if (scalein() == 1 && scaleout() == 1 && shiftin() == 0) {
+- for (int j = start(this->Y_Axis()), ej = stop(this->Y_Axis()) ; j < ej ; ++j)
+- for (int i = start(this->X_Axis(),j), ei = stop(this->X_Axis(),j) ; i < ei ; ++i) {
++ for (int j = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis()),
++ ej = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis()) ; j < ej ; ++j)
++ for (int i = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis(),j),
++ ei = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis(),j) ; i < ei ; ++i) {
+ long bin = long(0.5 + (getpixel(in,i,j,DataIn(0))));
+ DataOut bs = getpixel(out,bin,index,DataOut(0));
+ setpixel(out, bin, index, bs+1);
+ }
+- } else if (scalein() == 1) {
+- for (int j = start(this->Y_Axis()), ej = stop(this->Y_Axis()) ; j < ej ; ++j)
+- for (int i = start(this->X_Axis(),j), ei = stop(this->X_Axis(),j) ; i < ei ; ++i) {
++ }
++ else if (scalein() == 1) {
++ for (int j = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis()),
++ ej = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis()) ; j < ej ; ++j)
++ for (int i = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis(),j),
++ ei = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis(),j) ; i < ei ; ++i) {
+ long bin = long(0.5 + (shiftin()+getpixel(in,i,j,DataIn(0))));
+ DataOut bs = getpixel(out,bin,index,DataOut(0));
+ setpixel(out, bin, index, scaleout()+bs);
+ }
+- } else { // all modes
+- for (int j = start(this->Y_Axis()), ej = stop(this->Y_Axis()) ; j < ej ; ++j)
+- for (int i = start(this->X_Axis(),j), ei = stop(this->X_Axis(),j) ; i < ei ; ++i) {
++ }
++ else { // all modes
++ for (int j = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->Y_Axis()),
++ ej = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->Y_Axis()) ; j < ej ; ++j)
++ for (int i = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::start(this->X_Axis(),j),
++ ei = vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::stop(this->X_Axis(),j) ; i < ei ; ++i) {
+ long bin = long(0.5 + (shiftin()+getpixel(in,i,j,DataIn(0)))/scalein());
+ DataOut bs = getpixel(out,bin,index,DataOut(0));
+ setpixel(out, bin, index, scaleout()+bs);
+@@ -55,8 +65,8 @@ bool vipl_histogram <ImgIn,ImgOut,DataIn
+ {
+ const int index = indexout();
+ ImgOut &out = *this->out_data_ptr();
+- for (int i = start_dst(this->X_Axis()),
+- ei = stop_dst(this->X_Axis()); i < ei; ++i)
++ for (int i = this->start_dst(this->X_Axis()),
++ ei = this->stop_dst(this->X_Axis()); i < ei; ++i)
+ setpixel(out, i, index, DataOut(0));
+ return true;
+ }
+--- vxl-1.14.0.orig/contrib/tbl/vipl/filter/vipl_filter_2d.txx
++++ vxl-1.14.0/contrib/tbl/vipl/filter/vipl_filter_2d.txx
+@@ -112,7 +112,7 @@ template < class ImgIn,class ImgOut,clas
+ vipl_section_descriptor<DataOut>& secDesc = *dstitr;
+ put_secp( new vipl_section_descriptor<DataOut> (secDesc) );
+ #else
+- put_secp( new vipl_section_descriptor<DataOut> (*dstitr));
++ vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::put_secp( new vipl_section_descriptor<DataOut> (*dstitr));
+ #endif
+ this->ref_dst_section()->ref_overlap()[0] = this->image_border_size();
+ this->ref_dst_section()->ref_overlap()[1] = this->image_border_size();
+@@ -121,7 +121,7 @@ template < class ImgIn,class ImgOut,clas
+ vipl_section_descriptor<DataIn>& inSecDesc = *it;
+ put_insecp( new vipl_section_descriptor<DataIn> (inSecDesc));
+ #else
+- put_insecp( new vipl_section_descriptor<DataIn> (*it));
++ vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::put_insecp( new vipl_section_descriptor<DataIn> (*it));
+ #endif
+ this->ref_src_section()->ref_overlap()[0] = this->image_border_size();
+ this->ref_src_section()->ref_overlap()[1] = this->image_border_size();
+@@ -151,7 +151,7 @@ template < class ImgIn,class ImgOut,clas
+ vipl_section_descriptor<DataOut>& secDesc2 = *it;
+ put_secp( new vipl_section_descriptor<DataOut> (secDesc2));
+ #else
+- put_secp( new vipl_section_descriptor<DataOut> (*it));
++ vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::put_secp( new vipl_section_descriptor<DataOut> (*it));
+ #endif
+ this->ref_dst_section()->ref_overlap()[0] = this->image_border_size();
+ this->ref_dst_section()->ref_overlap()[1] = this->image_border_size();
+@@ -160,7 +160,7 @@ template < class ImgIn,class ImgOut,clas
+ vipl_section_descriptor<DataIn>& inSecDesc2 = *srcitr;
+ put_insecp( new vipl_section_descriptor<DataIn> (inSecDesc2));
+ #else
+- put_insecp( new vipl_section_descriptor<DataIn> (*srcitr));
++ vipl_filter<ImgIn,ImgOut,DataIn,DataOut,2,PixelItr>::put_insecp( new vipl_section_descriptor<DataIn> (*srcitr));
+ #endif
+ this->ref_src_section()->ref_overlap()[0] = this->image_border_size();
+ this->ref_src_section()->ref_overlap()[1] = this->image_border_size();
+--- vxl-1.14.0.orig/contrib/rpl/rgrl/rgrl_est_proj_rad_func.txx
++++ vxl-1.14.0/contrib/rpl/rgrl/rgrl_est_proj_rad_func.txx
+@@ -139,7 +139,7 @@ reduced_proj_rad_jacobian( vnl_matrix<do
+
+ // 1. get projection matrix jacobian
+ vnl_matrix_fixed<double, Tdim, (Tdim+1)*(Fdim+1)-1> dP_dp;
+- reduced_proj_jacobian( dP_dp, proj, from );
++ base_type::reduced_proj_jacobian( dP_dp, proj, from );
+
+ // 2. gradient w.r.t to mapped location
+ vnl_matrix_fixed<double, Tdim, Tdim > dD_dx;
+@@ -220,7 +220,7 @@ full_proj_rad_jacobian( vnl_matrix<doubl
+
+ // 1. get projection matrix jacobian
+ vnl_matrix_fixed<double, Tdim, (Tdim+1)*(Fdim+1)> dP_dp;
+- full_proj_jacobian( dP_dp, proj, from );
++ base_type::full_proj_jacobian( dP_dp, proj, from );
+
+ // 2. gradient w.r.t to mapped location
+ vnl_matrix_fixed<double, Tdim, Tdim > dD_dx;
+@@ -358,7 +358,7 @@ f(vnl_vector<double> const& x, vnl_vecto
+
+ // retrieve the projection matrix
+ vnl_matrix_fixed<double, Tdim+1, Fdim+1> proj;
+- restored_centered_proj( proj, x );
++ base_type::restored_centered_proj( proj, x );
+
+ // retrieve the radial distortion parameters
+ transfer_radial_params_into_temp_storage( x );
+@@ -407,7 +407,7 @@ gradf(vnl_vector<double> const& x, vnl_m
+
+ // retrieve the projection matrix
+ vnl_matrix_fixed<double, Tdim+1, Fdim+1> proj;
+- restored_centered_proj( proj, x );
++ base_type::restored_centered_proj( proj, x );
+
+ // retrieve the radial distortion parameters
+ transfer_radial_params_into_temp_storage( x );
+--- vxl-1.14.0.orig/contrib/rpl/rgrl/rgrl_est_proj_rad_func.h
++++ vxl-1.14.0/contrib/rpl/rgrl/rgrl_est_proj_rad_func.h
+@@ -18,6 +18,8 @@ class rgrl_est_proj_rad_func
+ : public rgrl_est_proj_func<Tdim, Fdim>
+ {
+ public:
++ typedef rgrl_est_proj_func<Tdim, Fdim> base_type;
++ public:
+ //: ctor
+ rgrl_est_proj_rad_func( rgrl_set_of<rgrl_match_set_sptr> const& matches,
+ unsigned int camera_dof,
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/vpgl_essential_matrix.txx
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/vpgl_essential_matrix.txx
+@@ -66,7 +66,7 @@ template <class T>
+ const vpgl_essential_matrix<T>&
+ vpgl_essential_matrix<T>::operator=( const vpgl_essential_matrix<T>& fm )
+ {
+- set_matrix( fm.F_ );
++ vpgl_fundamental_matrix<T>::set_matrix( fm.F_ );
+ return *this;
+ }
+
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/vpgl_reg_fundamental_matrix.txx
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/vpgl_reg_fundamental_matrix.txx
+@@ -16,7 +16,7 @@ vpgl_reg_fundamental_matrix<T>::vpgl_reg
+ vnl_matrix_fixed<T,3,3> default_matrix( (T)0 );
+ default_matrix(0,1) = default_matrix(0,2) = (T)1;
+ default_matrix(1,0) = default_matrix(2,0) = -(T)1;
+- set_matrix( default_matrix );
++ vpgl_fundamental_matrix<T>::set_matrix( default_matrix );
+ }
+
+
+@@ -53,7 +53,7 @@ bool vpgl_reg_fundamental_matrix<T>::set
+ fm.put( 1, 2, -ex );
+ fm.put( 2, 0, -ey );
+ fm.put( 2, 1, ex );
+- set_matrix( fm );
++ vpgl_fundamental_matrix<T>::set_matrix( fm );
+ return true;
+ }
+
+@@ -67,7 +67,7 @@ void vpgl_reg_fundamental_matrix<T>::set
+ fm.put( 1, 2, -b );
+ fm.put( 2, 0, -a );
+ fm.put( 2, 1, b );
+- set_matrix( fm );
++ vpgl_fundamental_matrix<T>::set_matrix( fm );
+ };
+
+
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/vpgl_affine_fundamental_matrix.txx
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/vpgl_affine_fundamental_matrix.txx
+@@ -16,7 +16,7 @@ vpgl_affine_fundamental_matrix<T>::vpgl_
+ vnl_matrix_fixed<T,3,3> default_matrix( (T)0 );
+ default_matrix(0,1) = default_matrix(0,2) = (T)1;
+ default_matrix(1,0) = default_matrix(2,0) = -(T)1;
+- set_matrix( default_matrix );
++ vpgl_fundamental_matrix<T>::set_matrix( default_matrix );
+ }
+
+
+@@ -40,7 +40,7 @@ void vpgl_affine_fundamental_matrix<T>::
+ fm.put( 2, 2, c );
+ fm.put( 1, 2, d );
+ fm.put( 0, 2, e );
+- set_matrix( fm );
++ vpgl_fundamental_matrix<T>::set_matrix( fm );
+ };
+
+
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/vpgl_affine_camera.txx
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/vpgl_affine_camera.txx
+@@ -14,7 +14,7 @@ vpgl_affine_camera<T>::vpgl_affine_camer
+ {
+ vnl_matrix_fixed<T,3,4> C( (T)0 );
+ C(0,0) = C(1,1) = C(2,3) = (T)1;
+- set_matrix( C );
++ vpgl_proj_camera<T>::set_matrix( C );
+ }
+
+
+@@ -35,7 +35,7 @@ vpgl_affine_camera<T>::vpgl_affine_camer
+ vnl_matrix_fixed<T,3,4> C( camera_matrix );
+ C = C/C(2,3);
+ C(2,0) = (T)0; C(2,1) = (T)0; C(2,2) = (T)0;
+- set_matrix( C );
++ vpgl_proj_camera<T>::set_matrix( C );
+ }
+
+
+@@ -51,7 +51,7 @@ void vpgl_affine_camera<T>::set_rows(
+ C(1,i) = row2(i);
+ }
+ C(2,3) = (T)1;
+- set_matrix( C );
++ vpgl_proj_camera<T>::set_matrix( C );
+ }
+
+ // Code for easy instantiation.
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/vpgl_local_rational_camera.txx
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/vpgl_local_rational_camera.txx
+@@ -126,16 +126,16 @@ bool vpgl_local_rational_camera<T>::save
+ << "SpecId = \"RPC00B\";\n"
+ << "BEGIN_GROUP = IMAGE\n"
+ << "\n\n" // skip errBias and errRand fields
+- << " lineOffset = " << offset(vpgl_rational_camera<T>::V_INDX) << '\n'
+- << " sampOffset = " << offset(vpgl_rational_camera<T>::U_INDX) << '\n'
+- << " latOffset = " << offset(vpgl_rational_camera<T>::Y_INDX) << '\n'
+- << " longOffset = " << offset(vpgl_rational_camera<T>::X_INDX) << '\n'
+- << " heightOffset = " << offset(vpgl_rational_camera<T>::Z_INDX) << '\n'
+- << " lineScale = " << scale(vpgl_rational_camera<T>::V_INDX) << '\n'
+- << " sampScale = " << scale(vpgl_rational_camera<T>::U_INDX) << '\n'
+- << " latScale = " << scale(vpgl_rational_camera<T>::Y_INDX) << '\n'
+- << " longScale = " << scale(vpgl_rational_camera<T>::X_INDX) << '\n'
+- << " heightScale = " << scale(vpgl_rational_camera<T>::Z_INDX) << '\n';
++ << " lineOffset = " << vpgl_rational_camera<T>::offset(vpgl_rational_camera<T>::V_INDX) << '\n'
++ << " sampOffset = " << vpgl_rational_camera<T>::offset(vpgl_rational_camera<T>::U_INDX) << '\n'
++ << " latOffset = " << vpgl_rational_camera<T>::offset(vpgl_rational_camera<T>::Y_INDX) << '\n'
++ << " longOffset = " << vpgl_rational_camera<T>::offset(vpgl_rational_camera<T>::X_INDX) << '\n'
++ << " heightOffset = " << vpgl_rational_camera<T>::offset(vpgl_rational_camera<T>::Z_INDX) << '\n'
++ << " lineScale = " << vpgl_rational_camera<T>::scale(vpgl_rational_camera<T>::V_INDX) << '\n'
++ << " sampScale = " << vpgl_rational_camera<T>::scale(vpgl_rational_camera<T>::U_INDX) << '\n'
++ << " latScale = " << vpgl_rational_camera<T>::scale(vpgl_rational_camera<T>::Y_INDX) << '\n'
++ << " longScale = " << vpgl_rational_camera<T>::scale(vpgl_rational_camera<T>::X_INDX) << '\n'
++ << " heightScale = " << vpgl_rational_camera<T>::scale(vpgl_rational_camera<T>::Z_INDX) << '\n';
+ vnl_matrix_fixed<double,4,20> coeffs = this->coefficient_matrix();
+ file_out << " lineNumCoef = (";
+ for (int i=0; i<20; i++) {
+--- vxl-1.14.0.orig/contrib/brl/bbas/bsta/algo/bsta_adaptive_updater.txx
++++ vxl-1.14.0/contrib/brl/bbas/bsta/algo/bsta_adaptive_updater.txx
+@@ -42,7 +42,7 @@ bsta_mg_statistical_updater<mix_dist_>::
+
+ // if no matches add a new component
+ if (matched.empty()) {
+- insert(mix,sample,alpha);
++ this->insert(mix,sample,alpha);
+ mix.normalize_weights();
+ }
+ else
+@@ -123,7 +123,7 @@ bsta_mg_grimson_statistical_updater<mix_
+ mix.set_weight(i, weight);
+ }
+ if (match<0) {
+- insert(mix,sample,alpha);
++ this->insert(mix,sample,alpha);
+ match = mix.num_components()-1;
+ }
+
+--- vxl-1.14.0.orig/contrib/brl/bbas/bsta/algo/bsta_sample_set.h
++++ vxl-1.14.0/contrib/brl/bbas/bsta/algo/bsta_sample_set.h
+@@ -35,7 +35,7 @@ class bsta_sample_set : public bsta_parz
+ typedef typename bsta_parzen_sphere<T,n>::vector_type vector_;
+
+ // Constructor
+- bsta_sample_set(T bandwidth = T(1)) : bsta_parzen_sphere<T,n>() { set_bandwidth(bandwidth); }
++ bsta_sample_set(T bandwidth = T(1)) : bsta_parzen_sphere<T,n>() { this->set_bandwidth(bandwidth); }
+
+ //: Compute the mean in a window around the given pt, the window size is the bandwidth
+ // If there are no points within bandwidth of the input pt, \return false
Modified: trunk/packages/vxl/trunk/debian/patches/install_doxygen.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/install_doxygen.patch 2012-06-19 08:41:23 UTC (rev 11383)
+++ trunk/packages/vxl/trunk/debian/patches/install_doxygen.patch 2012-06-19 10:17:11 UTC (rev 11384)
@@ -3,20 +3,20 @@
Last-Update: 2011-07-24
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=28366141
-Index: vxl-1.17.0/config/cmake/export/CMakeLists.txt
+Index: vxl-1.14.0/config/cmake/export/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/config/cmake/export/CMakeLists.txt 2011-12-12 21:02:31.000000000 +0000
-+++ vxl-1.17.0/config/cmake/export/CMakeLists.txt 2012-06-05 16:54:16.460824542 +0000
-@@ -48,4 +48,5 @@
+--- vxl-1.14.0.orig/config/cmake/export/CMakeLists.txt 2009-12-11 18:29:13.000000000 +0100
++++ vxl-1.14.0/config/cmake/export/CMakeLists.txt 2011-12-08 11:36:10.000000000 +0100
+@@ -49,4 +49,5 @@
${VXL_CMAKE_DIR}/VXLStandardOptions.cmake
${VXL_CMAKE_DIR}/UseVXL.cmake
${VXL_CMAKE_DIR}/UseVGUI.cmake
+ ${VXL_CMAKE_DIR}/../doxygen/doxygen.cmake
)
-Index: vxl-1.17.0/config/cmake/Modules/VXLConfig_export.cmake.in
+Index: vxl-1.14.0/config/cmake/Modules/VXLConfig_export.cmake.in
===================================================================
---- vxl-1.17.0.orig/config/cmake/Modules/VXLConfig_export.cmake.in 2011-12-13 16:11:34.000000000 +0000
-+++ vxl-1.17.0/config/cmake/Modules/VXLConfig_export.cmake.in 2012-06-05 16:54:16.460824542 +0000
+--- vxl-1.14.0.orig/config/cmake/Modules/VXLConfig_export.cmake.in 2011-12-08 11:43:52.000000000 +0100
++++ vxl-1.14.0/config/cmake/Modules/VXLConfig_export.cmake.in 2011-12-08 11:44:37.000000000 +0100
@@ -41,6 +41,11 @@
# Clients projects should not use the Find*.cmake files in this directory.
SET(VXL_CMAKE_DIR "@CMAKE_INSTALL_PREFIX@/share/vxl/cmake")
Modified: trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/renamelibs.patch 2012-06-19 08:41:23 UTC (rev 11383)
+++ trunk/packages/vxl/trunk/debian/patches/renamelibs.patch 2012-06-19 10:17:11 UTC (rev 11384)
@@ -4,10 +4,10 @@
Last-Update: 2011-07-24
Forwarded: not-needed
-Index: vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oxl/osl/CMakeLists.txt 2012-06-05 16:53:19.000000000 +0000
-+++ vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt 2012-06-05 16:54:02.232824737 +0000
+--- vxl-1.14.0.orig/contrib/oxl/osl/CMakeLists.txt 2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt 2011-09-24 15:35:31.000000000 +0000
@@ -44,11 +44,11 @@
)
AUX_SOURCE_DIRECTORY(Templates osl_sources)
@@ -24,11 +24,11 @@
IF (BUILD_EXAMPLES)
SUBDIRS(examples)
-Index: vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2012-06-05 16:53:19.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt 2012-06-05 16:54:02.232824737 +0000
-@@ -21,9 +21,10 @@
+--- vxl-1.14.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt 2011-09-24 15:35:31.000000000 +0000
+@@ -22,9 +22,10 @@
iowin32.c iowin32.h)
ENDIF(WIN32)
@@ -42,10 +42,38 @@
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/minizip ${minizip_sources})
ENDIF(ZLIB_FOUND)
-Index: vxl-1.17.0/contrib/oxl/xcv/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/gst/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oxl/xcv/CMakeLists.txt 2011-05-22 14:50:44.000000000 +0000
-+++ vxl-1.17.0/contrib/oxl/xcv/CMakeLists.txt 2012-06-05 16:54:02.236824739 +0000
+--- vxl-1.14.0.orig/contrib/gel/gst/CMakeLists.txt 2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt 2011-09-24 15:35:31.000000000 +0000
+@@ -16,9 +16,9 @@
+
+ AUX_SOURCE_DIRECTORY(Templates gst_sources)
+
+-ADD_LIBRARY(gst ${gst_sources})
+-SET_TARGET_PROPERTIES(gst PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+-INSTALL_TARGETS(/lib gst)
++ADD_LIBRARY(gel_gst ${gst_sources})
++SET_TARGET_PROPERTIES(gel_gst PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib gel_gst)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gst ${gst_sources})
+
+-TARGET_LINK_LIBRARIES(gst vbl)
++TARGET_LINK_LIBRARIES(gel_gst vbl)
+Index: vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/oxl/osl/tests/CMakeLists.txt 2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/oxl/osl/tests/CMakeLists.txt 2011-09-24 15:35:31.000000000 +0000
+@@ -1,4 +1,4 @@
+ # Nothing to be tested yet
+
+ ADD_EXECUTABLE( osl_test_include test_include.cxx )
+-TARGET_LINK_LIBRARIES( osl_test_include osl )
++TARGET_LINK_LIBRARIES( osl_test_include oxl_osl )
+Index: vxl-1.14.0/contrib/oxl/xcv/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/oxl/xcv/CMakeLists.txt 2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/oxl/xcv/CMakeLists.txt 2011-09-24 15:35:31.000000000 +0000
@@ -32,6 +32,6 @@
ADD_EXECUTABLE(xcv ${xcv_sources})
@@ -54,10 +82,40 @@
+TARGET_LINK_LIBRARIES(xcv oxl_osl mvl vgui vgl vil1 vnl vul vcl)
ENDIF (HAS_VGUI)
-Index: vxl-1.17.0/contrib/conversions/geometry/tests/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/conversions/geometry/tests/CMakeLists.txt 2006-05-12 18:45:17.000000000 +0000
-+++ vxl-1.17.0/contrib/conversions/geometry/tests/CMakeLists.txt 2012-06-05 16:54:02.236824739 +0000
+--- vxl-1.14.0.orig/contrib/gel/vmal/CMakeLists.txt 2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt 2011-09-24 15:35:31.000000000 +0000
+@@ -41,7 +41,7 @@
+
+ IF(BUILD_OXL)
+ INCLUDE_DIRECTORIES(${OXL_INCLUDE_DIR})
+- TARGET_LINK_LIBRARIES(vmal mvl osl vil)
++ TARGET_LINK_LIBRARIES(vmal mvl oxl_osl vil)
+ ENDIF(BUILD_OXL)
+
+ IF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
+Index: vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-09-24 15:35:31.000000000 +0000
+@@ -36,10 +36,10 @@
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl/pro ${bmdl_pro_sources})
+
+ TARGET_LINK_LIBRARIES(bmdl_pro bmdl bprb vil vil_io vpgl_file_formats vgl_io
+- bgeo vsol brip vpgl_pro vgl vul vpl imesh_algo minizip)
++ bgeo vsol brip vpgl_pro vgl vul vpl imesh_algo b3p_minizip)
+
+ IF(ZLIB_FOUND)
+- TARGET_LINK_LIBRARIES( bmdl_pro minizip )
++ TARGET_LINK_LIBRARIES( bmdl_pro b3p_minizip )
+ ENDIF(ZLIB_FOUND)
+
+ IF( BUILD_TESTING )
+Index: vxl-1.14.0/contrib/conversions/geometry/tests/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/conversions/geometry/tests/CMakeLists.txt 2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/conversions/geometry/tests/CMakeLists.txt 2011-09-24 15:35:31.000000000 +0000
@@ -6,7 +6,7 @@
ENDIF(BUILD_GEL)
IF(BUILD_OXL)
@@ -67,10 +125,30 @@
ENDIF(BUILD_OXL)
IF(BUILD_GEL)
-Index: vxl-1.17.0/contrib/mul/mcal/tests/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/mcal/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mcal/tests/CMakeLists.txt 2009-12-26 15:50:38.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/mcal/tests/CMakeLists.txt 2012-06-05 16:54:02.236824739 +0000
+--- vxl-1.14.0.orig/contrib/mul/mcal/CMakeLists.txt 2011-09-24 15:35:28.000000000 +0000
++++ vxl-1.14.0/contrib/mul/mcal/CMakeLists.txt 2011-09-24 15:35:31.000000000 +0000
+@@ -18,11 +18,11 @@
+ )
+ AUX_SOURCE_DIRECTORY(Templates mcal_sources)
+
+-ADD_LIBRARY(mcal ${mcal_sources})
+-SET_TARGET_PROPERTIES(mcal PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+-INSTALL_TARGETS(/lib mcal)
++ADD_LIBRARY(mul_mcal ${mcal_sources})
++SET_TARGET_PROPERTIES(mul_mcal PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib mul_mcal)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mcal ${mcal_sources})
+-TARGET_LINK_LIBRARIES(mcal mbl vnl vnl_algo vul)
++TARGET_LINK_LIBRARIES(mul_mcal mbl vnl vnl_algo vul)
+
+ IF (BUILD_TESTING)
+ SUBDIRS(tests)
+Index: vxl-1.14.0/contrib/mul/mcal/tests/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/mul/mcal/tests/CMakeLists.txt 2011-09-24 15:36:14.000000000 +0000
++++ vxl-1.14.0/contrib/mul/mcal/tests/CMakeLists.txt 2011-09-24 16:05:59.000000000 +0000
@@ -6,11 +6,11 @@
test_trivial_ca.cxx
test_general_ca.cxx
Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series 2012-06-19 08:41:23 UTC (rev 11383)
+++ trunk/packages/vxl/trunk/debian/patches/series 2012-06-19 10:17:11 UTC (rev 11384)
@@ -1,9 +1,15 @@
vxl.soname.patch
+video4linux.patch
+opencl_unix.patch
sse2.patch
renamelibs.patch
+fixcomp.patch
fix_alphacomp.patch
install_doxygen.patch
+libav_trunk.patch
ffmpeg_C99.patch
-fixosl.patch
-insane.patch
-bits.patch
+removedoxyen.patch
+png15.patch
+dcmtkgcc47.patch
+vnl_r28976.patch
+gcc47other.patch
Modified: trunk/packages/vxl/trunk/debian/patches/sse2.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/sse2.patch 2012-06-19 08:41:23 UTC (rev 11383)
+++ trunk/packages/vxl/trunk/debian/patches/sse2.patch 2012-06-19 10:17:11 UTC (rev 11384)
@@ -8,10 +8,10 @@
Origin: vendor, http://itk.org/gitweb?p=ITK.git;a=commit;h=b106984
Last-Update: 2012-12-20
-Index: vxl-1.17.0/core/vnl/vnl_math.h
+Index: vxl-1.14.0/core/vnl/vnl_math.h
===================================================================
---- vxl-1.17.0.orig/core/vnl/vnl_math.h 2012-03-16 15:27:06.000000000 +0000
-+++ vxl-1.17.0/core/vnl/vnl_math.h 2012-06-05 16:53:56.196824822 +0000
+--- vxl-1.14.0.orig/core/vnl/vnl_math.h 2009-11-21 16:45:28.000000000 +0100
++++ vxl-1.14.0/core/vnl/vnl_math.h 2011-04-19 12:55:21.000000000 +0200
@@ -44,16 +44,20 @@
#endif
@@ -35,7 +35,7 @@
# define GCC_USE_FAST_IMPL 1
#else
# define GCC_USE_FAST_IMPL 0
-@@ -201,7 +205,7 @@
+@@ -184,7 +188,7 @@
// We assume that the rounding mode is not changed from the default
// one (or at least that it is always restored to the default one).
@@ -44,7 +44,7 @@
inline int vnl_math_rnd_halfinttoeven(float x)
{
-@@ -312,7 +316,7 @@
+@@ -295,7 +299,7 @@
// We also assume that the rounding mode is not changed from the default
// one (or at least that it is always restored to the default one).
@@ -53,7 +53,7 @@
inline int vnl_math_rnd_halfintup(float x) { return vnl_math_rnd_halfinttoeven(2*x+0.5f)>>1; }
inline int vnl_math_rnd_halfintup(double x) { return vnl_math_rnd_halfinttoeven(2*x+0.5)>>1; }
-@@ -345,7 +349,7 @@
+@@ -328,7 +332,7 @@
// We assume that the rounding mode is not changed from the default
// one (or at least that it is always restored to the default one).
@@ -62,7 +62,7 @@
inline int vnl_math_rnd(float x) { return vnl_math_rnd_halfinttoeven(x); }
inline int vnl_math_rnd(double x) { return vnl_math_rnd_halfinttoeven(x); }
-@@ -367,7 +371,7 @@
+@@ -350,7 +354,7 @@
// We also assume that the rounding mode is not changed from the default
// one (or at least that it is always restored to the default one).
@@ -71,7 +71,7 @@
inline int vnl_math_floor(float x)
{
-@@ -452,7 +456,7 @@
+@@ -435,7 +439,7 @@
// We also assume that the rounding mode is not changed from the default
// one (or at least that it is always restored to the default one).
@@ -80,10 +80,10 @@
inline int vnl_math_ceil(float x)
{
-Index: vxl-1.17.0/core/vil/vil_round.h
+Index: vxl-1.14.0/core/vil/vil_round.h
===================================================================
---- vxl-1.17.0.orig/core/vil/vil_round.h 2009-05-08 15:47:55.000000000 +0000
-+++ vxl-1.17.0/core/vil/vil_round.h 2012-06-05 16:53:56.196824822 +0000
+--- vxl-1.14.0.orig/core/vil/vil_round.h 2011-04-19 12:56:23.000000000 +0200
++++ vxl-1.14.0/core/vil/vil_round.h 2011-04-19 12:56:15.000000000 +0200
@@ -25,9 +25,10 @@
# endif
#endif
Added: trunk/packages/vxl/trunk/debian/patches/vnl_r28976.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/vnl_r28976.patch (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/vnl_r28976.patch 2012-06-19 10:17:11 UTC (rev 11384)
@@ -0,0 +1,37 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vxl (1.14.0-18) UNRELEASED; urgency=low
+ .
+ * Fix compilation with gcc 4.7. Closes: #674350
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: http://bugs.debian.org/674350
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vxl-1.14.0.orig/core/vnl/vnl_matrix_fixed_ref.h
++++ vxl-1.14.0/core/vnl/vnl_matrix_fixed_ref.h
+@@ -653,7 +653,7 @@ class vnl_matrix_fixed_ref : public vnl_
+ //: Return true if *this == rhs
+ bool operator_eq (vnl_matrix_fixed_ref_const<T,num_rows,num_cols> const & rhs) const
+ {
+- return equal( this->data_block(), rhs.data_block() );
++ return vnl_matrix_fixed_ref<T,num_rows,num_cols>::equal( this->data_block(), rhs.data_block() );
+ }
+
+ //: Equality operator
Modified: trunk/packages/vxl/trunk/debian/patches/vxl.soname.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/vxl.soname.patch 2012-06-19 08:41:23 UTC (rev 11383)
+++ trunk/packages/vxl/trunk/debian/patches/vxl.soname.patch 2012-06-19 10:17:11 UTC (rev 11384)
@@ -2,10 +2,10 @@
Author: Mathieu Malaterre <malat at debian.org>
Last-Update: 2011-07-24
-Index: vxl-1.17.0/CMakeLists.txt
+Index: vxl-1.14.0/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/CMakeLists.txt 2009-11-27 14:38:10.000000000 +0000
-+++ vxl-1.17.0/CMakeLists.txt 2012-06-05 16:53:19.080825333 +0000
+--- vxl-1.14.0.orig/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/CMakeLists.txt 2011-12-20 14:46:12.000000000 +0100
@@ -12,6 +12,26 @@
PROJECT(vxl)
@@ -33,10 +33,10 @@
SET( LIBRARY_OUTPUT_PATH ${vxl_BINARY_DIR}/lib CACHE PATH
"Output directory for the vxl libraries" )
-Index: vxl-1.17.0/v3p/netlib/CMakeLists.txt
+Index: vxl-1.14.0/v3p/netlib/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/v3p/netlib/CMakeLists.txt 2011-01-21 23:43:12.000000000 +0000
-+++ vxl-1.17.0/v3p/netlib/CMakeLists.txt 2012-06-05 16:53:19.080825333 +0000
+--- vxl-1.14.0.orig/v3p/netlib/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/v3p/netlib/CMakeLists.txt 2011-12-20 14:46:12.000000000 +0100
@@ -8,6 +8,7 @@
)
@@ -45,7 +45,7 @@
INSTALL_TARGETS( /lib netlib )
INSTALL_FILES( /include/vxl/v3p/netlib .h triangle )
-@@ -462,6 +463,7 @@
+@@ -409,6 +410,7 @@
# Create a netlib library with mangled symbols.
ADD_LIBRARY(v3p_netlib ${v3p_netlib_sources})
@@ -53,10 +53,10 @@
INSTALL_TARGETS( /lib v3p_netlib )
INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${v3p_netlib_sources})
IF(UNIX)
-Index: vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/rpl/rsdl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/rpl/rsdl/CMakeLists.txt 2009-09-20 14:20:00.000000000 +0000
-+++ vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt 2012-06-05 16:53:19.080825333 +0000
+--- vxl-1.14.0.orig/contrib/rpl/rsdl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/rpl/rsdl/CMakeLists.txt 2011-12-20 14:46:12.000000000 +0100
@@ -21,6 +21,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -65,10 +65,10 @@
INSTALL_TARGETS(/lib rsdl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rsdl ${rsdl_sources})
TARGET_LINK_LIBRARIES( rsdl vnl vbl )
-Index: vxl-1.17.0/contrib/mul/clsfy/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/clsfy/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/clsfy/CMakeLists.txt 2010-03-01 12:53:00.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/clsfy/CMakeLists.txt 2012-06-05 16:53:19.084825333 +0000
+--- vxl-1.14.0.orig/contrib/mul/clsfy/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/clsfy/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -53,6 +53,7 @@
AUX_SOURCE_DIRECTORY(Templates clsfy_sources)
@@ -77,10 +77,10 @@
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)
-Index: vxl-1.17.0/contrib/mul/vpdfl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/vpdfl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vpdfl/CMakeLists.txt 2009-12-26 15:50:13.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/vpdfl/CMakeLists.txt 2012-06-05 16:53:19.084825333 +0000
+--- vxl-1.14.0.orig/contrib/mul/vpdfl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vpdfl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -37,6 +37,7 @@
AUX_SOURCE_DIRECTORY(Templates vpdfl_sources)
@@ -89,10 +89,10 @@
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)
-Index: vxl-1.17.0/v3p/Qv/CMakeLists.txt
+Index: vxl-1.14.0/v3p/Qv/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/v3p/Qv/CMakeLists.txt 2005-10-11 12:49:51.000000000 +0000
-+++ vxl-1.17.0/v3p/Qv/CMakeLists.txt 2012-06-05 16:53:19.084825333 +0000
+--- vxl-1.14.0.orig/v3p/Qv/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/v3p/Qv/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -169,6 +169,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -101,10 +101,10 @@
TARGET_LINK_LIBRARIES( Qv vcl )
-Index: vxl-1.17.0/contrib/prip/vpyr/CMakeLists.txt
+Index: vxl-1.14.0/contrib/prip/vpyr/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/prip/vpyr/CMakeLists.txt 2006-10-17 13:03:35.000000000 +0000
-+++ vxl-1.17.0/contrib/prip/vpyr/CMakeLists.txt 2012-06-05 16:53:19.084825333 +0000
+--- vxl-1.14.0.orig/contrib/prip/vpyr/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/prip/vpyr/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -23,6 +23,7 @@
)
@@ -113,11 +113,11 @@
INSTALL_TARGETS(/lib vpyr)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vpyr ${vpyr_sources})
TARGET_LINK_LIBRARIES(vpyr vmap)
-Index: vxl-1.17.0/core/vgl/algo/CMakeLists.txt
+Index: vxl-1.14.0/core/vgl/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgl/algo/CMakeLists.txt 2011-03-15 15:57:23.000000000 +0000
-+++ vxl-1.17.0/core/vgl/algo/CMakeLists.txt 2012-06-05 16:53:19.084825333 +0000
-@@ -44,6 +44,7 @@
+--- vxl-1.14.0.orig/core/vgl/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vgl/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -41,6 +41,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_algo_sources)
ADD_LIBRARY(vgl_algo ${vgl_algo_sources})
@@ -125,10 +125,22 @@
TARGET_LINK_LIBRARIES( vgl_algo vgl vnl_algo vnl )
INSTALL_TARGETS(/lib vgl_algo)
-Index: vxl-1.17.0/contrib/brl/bbas/bgrl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bmvl/bcal/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bgrl/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bgrl/CMakeLists.txt 2012-06-05 16:53:19.084825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bmvl/bcal/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bmvl/bcal/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -21,6 +21,7 @@
+ )
+
+ ADD_LIBRARY(bcal ${bcal_sources})
++SET_TARGET_PROPERTIES(bcal PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bcal)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bmvl/bcal ${bcal_sources})
+ TARGET_LINK_LIBRARIES(bcal vgl_algo vnl_algo vnl vgl vcsl)
+Index: vxl-1.14.0/contrib/brl/bbas/bgrl/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bbas/bgrl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bgrl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -19,6 +19,7 @@
AUX_SOURCE_DIRECTORY(Templates bgrl_sources)
@@ -137,10 +149,10 @@
INSTALL_TARGETS(/lib bgrl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bgrl2/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bgrl2/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bgrl2/CMakeLists.txt 2009-12-26 15:50:56.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bgrl2/CMakeLists.txt 2012-06-05 16:53:19.084825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bbas/bgrl2/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bgrl2/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -17,7 +17,9 @@
)
@@ -152,10 +164,25 @@
TARGET_LINK_LIBRARIES( bgrl2 vbl )
#Algorithms on graphs
-Index: vxl-1.17.0/contrib/gel/vdgl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bgrl2/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vdgl/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/vdgl/CMakeLists.txt 2012-06-05 16:53:19.084825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bbas/bgrl2/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bgrl2/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -5,5 +5,8 @@
+ )
+
+ ADD_LIBRARY( bgrl2_algo ${bgrl2_algo_sources})
++SET_TARGET_PROPERTIES(bgrl2_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bgrl2_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl2/algo ${bgrl2_algo_sources})
+
+-TARGET_LINK_LIBRARIES( bgrl2_algo bgrl2 )
+\ No newline at end of file
++TARGET_LINK_LIBRARIES( bgrl2_algo bgrl2 )
+Index: vxl-1.14.0/contrib/gel/vdgl/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/gel/vdgl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vdgl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -23,6 +23,7 @@
AUX_SOURCE_DIRECTORY(Templates vdgl_sources)
@@ -164,10 +191,10 @@
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)
-Index: vxl-1.17.0/contrib/gel/vtol/algo/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/vtol/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vtol/algo/CMakeLists.txt 2011-03-15 15:57:23.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/vtol/algo/CMakeLists.txt 2012-06-05 16:53:19.084825333 +0000
+--- vxl-1.14.0.orig/contrib/gel/vtol/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vtol/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -8,6 +8,7 @@
AUX_SOURCE_DIRECTORY( Templates vtol_algo_sources )
@@ -176,10 +203,10 @@
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 )
-Index: vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/vtol/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vtol/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt 2012-06-05 16:53:19.088825333 +0000
+--- vxl-1.14.0.orig/contrib/gel/vtol/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vtol/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -35,6 +35,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -188,10 +215,10 @@
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})
-Index: vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/oxl/mvl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oxl/mvl/CMakeLists.txt 2009-09-20 19:44:15.000000000 +0000
-+++ vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt 2012-06-05 16:53:19.088825333 +0000
+--- vxl-1.14.0.orig/contrib/oxl/mvl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/oxl/mvl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -113,6 +113,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -200,10 +227,10 @@
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)
-Index: vxl-1.17.0/contrib/prip/vdtop/CMakeLists.txt
+Index: vxl-1.14.0/contrib/prip/vdtop/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/prip/vdtop/CMakeLists.txt 2006-10-17 13:03:35.000000000 +0000
-+++ vxl-1.17.0/contrib/prip/vdtop/CMakeLists.txt 2012-06-05 16:53:19.088825333 +0000
+--- vxl-1.14.0.orig/contrib/prip/vdtop/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/prip/vdtop/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -26,6 +26,7 @@
)
@@ -212,11 +239,11 @@
INSTALL_TARGETS(/lib vdtop)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vdtop ${vdtop_sources})
TARGET_LINK_LIBRARIES(vdtop vmap vil)
-Index: vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2011-05-22 14:50:44.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt 2012-06-05 16:53:19.088825333 +0000
-@@ -22,6 +22,8 @@
+--- vxl-1.14.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -23,6 +23,8 @@
ENDIF(WIN32)
ADD_LIBRARY( minizip ${minizip_sources} )
@@ -225,10 +252,22 @@
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/minizip ${minizip_sources})
ENDIF(ZLIB_FOUND)
-Index: vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bmvl/bmvv/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/tbl/vipl/CMakeLists.txt 2009-12-26 15:50:56.000000000 +0000
-+++ vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt 2012-06-05 16:53:19.088825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bmvl/bmvv/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bmvl/bmvv/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -39,6 +39,7 @@
+ )
+
+ ADD_LIBRARY(bmvv ${bmvv_sources})
++ SET_TARGET_PROPERTIES(bmvv PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bmvv)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bmvl/bmvv ${bmvv_sources})
+
+Index: vxl-1.14.0/contrib/tbl/vipl/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/tbl/vipl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/tbl/vipl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -77,6 +77,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -237,10 +276,10 @@
INSTALL_TARGETS(/lib vipl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vipl ${vipl_sources})
TARGET_LINK_LIBRARIES(vipl vil vil1 vnl vbl)
-Index: vxl-1.17.0/core/vul/CMakeLists.txt
+Index: vxl-1.14.0/core/vul/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vul/CMakeLists.txt 2010-01-25 21:16:13.000000000 +0000
-+++ vxl-1.17.0/core/vul/CMakeLists.txt 2012-06-05 16:53:19.088825333 +0000
+--- vxl-1.14.0.orig/core/vul/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vul/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -76,6 +76,7 @@
ENDIF(APPLE)
@@ -249,10 +288,22 @@
TARGET_LINK_LIBRARIES( vul vcl )
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vul
-Index: vxl-1.17.0/contrib/brl/bbas/bdgl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/b3p/shapelib/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bdgl/CMakeLists.txt 2009-12-10 20:00:35.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bdgl/CMakeLists.txt 2012-06-05 16:53:19.088825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/b3p/shapelib/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/b3p/shapelib/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -22,6 +22,7 @@
+ )
+
+ ADD_LIBRARY(shapelib ${shapelib_sources})
++SET_TARGET_PROPERTIES(shapelib PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib shapelib)
+
+
+Index: vxl-1.14.0/contrib/brl/bbas/bdgl/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bbas/bdgl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bdgl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -20,6 +20,7 @@
)
@@ -261,10 +312,10 @@
INSTALL_TARGETS(/lib bdgl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bdgl ${bdgl_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bdpg/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bdpg/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bdpg/CMakeLists.txt 2008-01-07 21:59:51.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bdpg/CMakeLists.txt 2012-06-05 16:53:19.088825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bbas/bdpg/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bdpg/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -10,6 +10,7 @@
AUX_SOURCE_DIRECTORY(Templates bdpg_sources)
@@ -273,11 +324,11 @@
INSTALL_TARGETS(/lib bdpg)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bdpg ${bdpg_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bgui/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bgui/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bgui/CMakeLists.txt 2011-05-22 14:50:44.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bgui/CMakeLists.txt 2012-06-05 16:53:19.088825333 +0000
-@@ -38,6 +38,7 @@
+--- vxl-1.14.0.orig/contrib/brl/bbas/bgui/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bgui/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -39,6 +39,7 @@
AUX_SOURCE_DIRECTORY(Templates bgui_sources)
ADD_LIBRARY(bgui ${bgui_sources})
@@ -285,23 +336,23 @@
INSTALL_TARGETS(/lib bgui)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgui ${bgui_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bgui3d/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bgui3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bgui3d/CMakeLists.txt 2011-05-22 14:50:44.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bgui3d/CMakeLists.txt 2012-06-05 16:53:19.092825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bbas/bgui3d/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bgui3d/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -60,6 +60,7 @@
- )
+ )
ADD_LIBRARY(bgui3d ${bgui3d_sources})
+SET_TARGET_PROPERTIES(bgui3d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
SET(BGUI3D_FOUND "YES" CACHE INTERNAL "Was bgui3d successfully built?" )
TARGET_LINK_LIBRARIES(bgui3d ${COIN3D_LIBRARY} vgui vpgl vnl_algo vnl vgl_algo vgl vul)
-Index: vxl-1.17.0/contrib/brl/bbas/bil/algo/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bil/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bil/algo/CMakeLists.txt 2011-09-27 17:29:36.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bil/algo/CMakeLists.txt 2012-06-05 16:53:19.092825333 +0000
-@@ -31,6 +31,9 @@
+--- vxl-1.14.0.orig/contrib/brl/bbas/bil/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bil/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -27,6 +27,9 @@
AUX_SOURCE_DIRECTORY(Templates bil_algo_sources)
ADD_LIBRARY( bil_algo ${bil_algo_sources} )
@@ -309,13 +360,13 @@
+INSTALL_TARGETS(/lib bil_algo)
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bil/algo ${bil_algo_sources})
- TARGET_LINK_LIBRARIES( bil_algo vil_algo vil vnl_algo vnl vgl_algo vgl vbl vsol)
+ TARGET_LINK_LIBRARIES( bil_algo vil_algo vil vnl_algo vnl vgl_algo vgl vbl )
-Index: vxl-1.17.0/contrib/brl/bbas/bil/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bil/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bil/CMakeLists.txt 2012-05-15 20:21:04.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bil/CMakeLists.txt 2012-06-05 16:53:19.092825333 +0000
-@@ -11,6 +11,9 @@
+--- vxl-1.14.0.orig/contrib/brl/bbas/bil/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bil/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -10,6 +10,9 @@
AUX_SOURCE_DIRECTORY(Templates bil_sources)
ADD_LIBRARY(bil ${bil_sources})
@@ -323,13 +374,13 @@
+INSTALL_TARGETS(/lib bil)
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bil ${bil_sources})
- TARGET_LINK_LIBRARIES(bil vil vil_io vsl vidl)
+ TARGET_LINK_LIBRARIES(bil vil vil_io vsl)
-Index: vxl-1.17.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2011-09-27 17:29:36.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2012-06-05 16:53:19.092825333 +0000
-@@ -13,6 +13,9 @@
+--- vxl-1.14.0.orig/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -13,4 +13,7 @@
)
ADD_LIBRARY( bmsh3d_algo ${bmsh3d_algo_sources})
@@ -337,12 +388,10 @@
+INSTALL_TARGETS(/lib bmsh3d_algo)
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bmsh3d/algo ${bmsh3d_algo_sources})
TARGET_LINK_LIBRARIES( bmsh3d_algo bmsh3d rply vgl vnl vul)
-
- IF( BUILD_TESTING )
-Index: vxl-1.17.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2008-01-20 15:44:20.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2012-06-05 16:53:19.092825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -5,6 +5,7 @@
)
@@ -351,10 +400,10 @@
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 )
-Index: vxl-1.17.0/contrib/brl/bbas/bnl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bnl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bnl/CMakeLists.txt 2008-01-07 21:59:51.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bnl/CMakeLists.txt 2012-06-05 16:53:19.092825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bbas/bnl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bnl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -8,6 +8,7 @@
)
@@ -363,10 +412,10 @@
INSTALL_TARGETS(/lib bnl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bnl ${bnl_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bsol/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bsol/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bsol/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bsol/CMakeLists.txt 2012-06-05 16:53:19.092825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bbas/bsol/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bsol/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -24,6 +24,7 @@
AUX_SOURCE_DIRECTORY(Templates bsol_sources)
@@ -375,22 +424,36 @@
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)
-Index: vxl-1.17.0/contrib/brl/bbas/bsta/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bsta/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bsta/CMakeLists.txt 2012-02-28 18:27:21.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bsta/CMakeLists.txt 2012-06-05 16:53:19.092825333 +0000
-@@ -62,6 +62,7 @@
+--- vxl-1.14.0.orig/contrib/brl/bbas/bsta/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bsta/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -20,6 +20,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bsta_algo_sources)
+ ADD_LIBRARY( bsta_algo ${bsta_algo_sources} )
++SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bsta_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bsta/algo ${bsta_algo_sources})
+ TARGET_LINK_LIBRARIES( bsta_algo bsta vnl_algo vnl )
+
+ IF( BUILD_TESTING )
+Index: vxl-1.14.0/contrib/brl/bbas/bsta/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bbas/bsta/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bsta/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -53,6 +53,7 @@
+
AUX_SOURCE_DIRECTORY(Templates bsta_sources)
ADD_LIBRARY(bsta ${bsta_sources})
+SET_TARGET_PROPERTIES(bsta PROPERTIES ${VNL_LIBRARY_PROPERTIES})
INSTALL_TARGETS(/lib bsta)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/bsta ${bsta_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2010-08-13 14:48:30.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2012-06-05 16:53:19.092825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -8,6 +8,9 @@
)
@@ -401,10 +464,10 @@
TARGET_LINK_LIBRARIES( bsta_vis bsta bsvg vnl )
-Index: vxl-1.17.0/contrib/brl/bbas/btol/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/btol/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/btol/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/btol/CMakeLists.txt 2012-06-05 16:53:19.092825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bbas/btol/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/btol/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -19,6 +19,7 @@
)
@@ -413,10 +476,10 @@
INSTALL_TARGETS(/lib btol)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/btol ${btol_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bugl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bugl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bugl/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bugl/CMakeLists.txt 2012-06-05 16:53:19.096825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bbas/bugl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bugl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -26,6 +26,7 @@
AUX_SOURCE_DIRECTORY(Templates bugl_sources)
@@ -425,23 +488,38 @@
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)
-Index: vxl-1.17.0/contrib/brl/bbas/bvgl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bvgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-03-06 16:58:20.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-06-05 16:53:19.096825333 +0000
-@@ -38,6 +38,7 @@
+--- vxl-1.14.0.orig/contrib/brl/bbas/bvgl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bvgl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -20,6 +20,7 @@
+ AUX_SOURCE_DIRECTORY(Templates bvgl_sources)
- #Create BVGL library
ADD_LIBRARY(bvgl ${bvgl_sources})
+SET_TARGET_PROPERTIES(bvgl PROPERTIES ${VNL_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)
-Index: vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt
+ TARGET_LINK_LIBRARIES(bvgl vsol vgl_algo vgl vnl vil vbl)
+Index: vxl-1.14.0/contrib/brl/bbas/bvrml/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-05-31 19:59:20.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-06-05 16:53:19.096825333 +0000
-@@ -31,6 +31,9 @@
+--- vxl-1.14.0.orig/contrib/brl/bbas/bvrml/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bvrml/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -6,5 +6,8 @@
+ )
+
+ ADD_LIBRARY(bvrml ${bvrml_sources})
++SET_TARGET_PROPERTIES(bvrml PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvrml)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bvrml ${bvrml_sources})
+
+-TARGET_LINK_LIBRARIES(bvrml vgl)
+\ No newline at end of file
++TARGET_LINK_LIBRARIES(bvrml vgl)
+Index: vxl-1.14.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -31,5 +31,8 @@
ENDIF(ECW_FOUND)
ADD_LIBRARY(bwm_algo ${bwm_algo_sources})
@@ -450,12 +528,11 @@
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bwm/algo ${bwm_algo})
TARGET_LINK_LIBRARIES( bwm_algo sdet vtol vil vil_algo vgl vgl_algo vnl vnl_algo vsol vpgl vpgl_algo vpgl_file_formats bgui brip vdgl bsta vgui vul vcl shapelib )
-
-Index: vxl-1.17.0/contrib/brl/bbas/bxml/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bxml/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bxml/CMakeLists.txt 2011-09-27 17:29:36.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bxml/CMakeLists.txt 2012-06-05 16:53:19.096825333 +0000
-@@ -27,6 +27,9 @@
+--- vxl-1.14.0.orig/contrib/brl/bbas/bxml/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bxml/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -22,6 +22,9 @@
AUX_SOURCE_DIRECTORY(Templates bxml_sources)
ADD_LIBRARY(bxml ${bxml_sources})
@@ -463,26 +540,61 @@
+INSTALL_TARGETS(/lib bxml)
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bxml ${bxml_sources})
- TARGET_LINK_LIBRARIES( bxml vbl_io vul vbl )
- IF(EXPAT_FOUND)
-Index: vxl-1.17.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt
+ TARGET_LINK_LIBRARIES( bxml expatpp vbl_io vul vbl )
+
+Index: vxl-1.14.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2011-11-17 13:11:12.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2012-06-05 16:53:19.096825333 +0000
-@@ -23,6 +23,9 @@
- ENDIF (NETLIB_FOUND)
+--- vxl-1.14.0.orig/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -17,5 +17,8 @@
+ AUX_SOURCE_DIRECTORY(Templates imesh_algo_sources)
ADD_LIBRARY( imesh_algo ${imesh_algo_sources} )
+SET_TARGET_PROPERTIES(imesh_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+INSTALL_TARGETS(/lib imesh_algo)
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/imesh/algo ${imesh_algo_sources})
- IF(NETLIB_FOUND)
+ TARGET_LINK_LIBRARIES( imesh_algo imesh vpgl vgl_algo vgl vnl_algo vnl vil )
+Index: vxl-1.14.0/contrib/brl/bmvl/brct/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bmvl/brct/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bmvl/brct/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -39,6 +39,7 @@
+ ENDIF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
-Index: vxl-1.17.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt
+ ADD_LIBRARY(brct ${brct_sources})
++SET_TARGET_PROPERTIES(brct PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib brct)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bmvl/brct ${brct_sources})
+
+Index: vxl-1.14.0/contrib/brl/bmvl/btom/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2011-09-05 22:31:01.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2012-06-05 16:53:19.100825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bmvl/btom/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bmvl/btom/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -18,6 +18,7 @@
+ AUX_SOURCE_DIRECTORY(Templates btom_sources)
+
+ ADD_LIBRARY(btom ${btom_sources})
++SET_TARGET_PROPERTIES(btom PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib btom)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/btom ${btom_sources})
+
+Index: vxl-1.14.0/contrib/brl/bpro/core/brip_pro/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bpro/core/brip_pro/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/core/brip_pro/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -14,4 +14,7 @@
+ AUX_SOURCE_DIRECTORY(processes brip_pro_sources)
+
+ ADD_LIBRARY(brip_pro ${brip_pro_sources})
++SET_TARGET_PROPERTIES(brip_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib brip_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/brip_pro ${brip_pro_sources})
+ TARGET_LINK_LIBRARIES(brip_pro bprb brdb brip vil_pro vil vsl)
+Index: vxl-1.14.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -14,6 +14,9 @@
AUX_SOURCE_DIRECTORY(processes bvgl_pro_sources)
@@ -493,11 +605,35 @@
TARGET_LINK_LIBRARIES(bvgl_pro bprb vil_pro bvgl vil vil_io)
-Index: vxl-1.17.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bpro/core/sdet_pro/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2011-12-20 01:47:54.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-06-05 16:53:19.100825333 +0000
-@@ -16,6 +16,9 @@
+--- vxl-1.14.0.orig/contrib/brl/bpro/core/sdet_pro/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/core/sdet_pro/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -16,4 +16,7 @@
+ AUX_SOURCE_DIRECTORY(processes sdet_pro_sources)
+
+ ADD_LIBRARY(sdet_pro ${sdet_pro_sources})
++SET_TARGET_PROPERTIES(sdet_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES(sdet_pro bprb brdb sdet vil_pro vil vsl sdet)
++INSTALL_TARGETS(/lib sdet_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/code/sdet_pro ${sdet_pro_sources})
+Index: vxl-1.14.0/contrib/brl/bpro/core/vidl_pro/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bpro/core/vidl_pro/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/core/vidl_pro/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -24,4 +24,7 @@
+ AUX_SOURCE_DIRECTORY(processes vidl_pro_sources)
+
+ ADD_LIBRARY(vidl_pro ${vidl_pro_sources})
++SET_TARGET_PROPERTIES(vidl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES(vidl_pro bprb brdb vidl vsl vul)
++INSTALL_TARGETS(/lib vidl_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/vidl_pro ${vidl_pro_sources})
+Index: vxl-1.14.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -17,6 +17,9 @@
AUX_SOURCE_DIRECTORY(processes vil_pro_sources)
ADD_LIBRARY(vil_pro ${vil_pro_sources})
@@ -505,12 +641,26 @@
+INSTALL_TARGETS(/lib vil_pro)
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/vil_pro ${vil_pro_sources})
- TARGET_LINK_LIBRARIES(vil_pro bbas_pro bprb bil bil_algo vil_algo vil_io vil vnl vul vsl)
+ TARGET_LINK_LIBRARIES(vil_pro bprb bil_algo vil_algo vil_io vil vnl vul vsl)
-Index: vxl-1.17.0/contrib/brl/bseg/bmdl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/CMakeLists.txt 2010-09-26 06:37:58.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bseg/bmdl/CMakeLists.txt 2012-06-05 16:53:19.100825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -17,6 +17,9 @@
+ AUX_SOURCE_DIRECTORY(processes vpgl_pro_sources)
+
+ ADD_LIBRARY(vpgl_pro ${vpgl_pro_sources})
++SET_TARGET_PROPERTIES(vpgl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib vpgl_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/vpgl_pro ${vpgl_pro_sources})
+
+ TARGET_LINK_LIBRARIES(vpgl_pro bprb vpgl_io vpgl vpgl_algo vnl vil bgeo vul)
+
+Index: vxl-1.14.0/contrib/brl/bseg/bmdl/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bmdl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bmdl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -16,6 +16,9 @@
AUX_SOURCE_DIRECTORY(Templates bmdl_sources)
@@ -521,10 +671,10 @@
TARGET_LINK_LIBRARIES(bmdl vil_algo imesh vgl_algo vgl vnl vil)
-Index: vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-11-17 18:51:11.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-06-05 16:53:19.100825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -31,6 +31,9 @@
AUX_SOURCE_DIRECTORY(processes bmdl_pro_sources)
@@ -534,12 +684,12 @@
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl/pro ${bmdl_pro_sources})
TARGET_LINK_LIBRARIES(bmdl_pro bmdl bprb vil vil_io vpgl_file_formats vgl_io
- vsol brip vpgl_pro vgl vul vpl imesh_algo minizip)
-Index: vxl-1.17.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+ bgeo vsol brip vpgl_pro vgl vul vpl imesh_algo minizip)
+Index: vxl-1.14.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-04-19 16:36:37.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-06-05 16:53:19.100825333 +0000
-@@ -20,6 +20,9 @@
+--- vxl-1.14.0.orig/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -10,6 +10,9 @@
)
ADD_LIBRARY(boxm_algo ${boxm_algo_sources})
@@ -549,11 +699,11 @@
IF( BUILD_TESTING )
SUBDIRS(tests)
-Index: vxl-1.17.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-03-09 21:40:04.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-06-05 16:53:19.100825333 +0000
-@@ -19,6 +19,9 @@
+--- vxl-1.14.0.orig/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -16,6 +16,9 @@
AUX_SOURCE_DIRECTORY(processes boxm_algo_pro_sources)
ADD_LIBRARY(boxm_algo_pro ${boxm_algo_pro_sources} )
@@ -561,13 +711,38 @@
+ INSTALL_TARGETS(/lib boxm_algo_pro)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boxm/algo/pro ${boxm_algo_pro_sources})
- TARGET_LINK_LIBRARIES(boxm_algo_pro boxm_algo boxm boxm_sample boxm_util boct bprb brdb bsta_pro vil_pro bsta vpgl_pro vpgl vpgl_algo vil vsol vgl brip vcl rply)
- # Need bsta_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<bsta_histogram_base> >
-Index: vxl-1.17.0/contrib/brl/bseg/brip/CMakeLists.txt
+ TARGET_LINK_LIBRARIES(boxm_algo_pro boxm_algo boxm_io bprb brdb bvxm_grid_pro)
+ ENDIF(EXPAT_FOUND)
+Index: vxl-1.14.0/contrib/brl/bseg/boxm/opt/open_cl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/brip/CMakeLists.txt 2012-05-31 17:18:24.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bseg/brip/CMakeLists.txt 2012-06-05 16:53:19.100825333 +0000
-@@ -40,6 +40,7 @@
+--- vxl-1.14.0.orig/contrib/brl/bseg/boxm/opt/open_cl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/boxm/opt/open_cl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -19,6 +19,9 @@
+ )
+ AUX_SOURCE_DIRECTORY(Templates boxm_opt_opencl_sources)
+ ADD_LIBRARY(boxm_opt_opencl ${boxm_opt_opencl_sources} ${bomx_opt_opencl_source_files})
++ SET_TARGET_PROPERTIES(boxm_opt_opencl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++ INSTALL_TARGETS(/lib boxm_opt_opencl)
++ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boxm/opt/open_cl ${boxm_opt_opencl_sources} ${bomx_opt_opencl_source_files})
+
+ TARGET_LINK_LIBRARIES(boxm_opt_opencl boxm_opt boxm bprb bgeo vnl vgl vbl vbl_io ${OPENCL_LIBRARIES})
+
+Index: vxl-1.14.0/contrib/brl/bseg/brec_batch/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/brec_batch/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/brec_batch/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -43,4 +43,4 @@
+ INCLUDE( ${MODULE_PATH}/NewCMake/FindDirectShow.cmake )
+ IF(DIRECTSHOW_FOUND)
+ ADD_DEFINITIONS(-DHAS_DIRECTSHOW)
+-ENDIF(DIRECTSHOW_FOUND)
+\ No newline at end of file
++ENDIF(DIRECTSHOW_FOUND)
+Index: vxl-1.14.0/contrib/brl/bseg/brip/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/brip/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/brip/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -34,6 +34,7 @@
AUX_SOURCE_DIRECTORY(Templates brip_sources)
ADD_LIBRARY(brip ${brip_sources})
@@ -575,11 +750,39 @@
INSTALL_TARGETS(/lib brip)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/brip ${brip_sources})
-Index: vxl-1.17.0/contrib/brl/bseg/bvpl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/bvpl/CMakeLists.txt 2011-09-09 22:19:29.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bseg/bvpl/CMakeLists.txt 2012-06-05 16:53:19.100825333 +0000
-@@ -19,6 +19,9 @@
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -25,6 +25,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bvpl_octree_sources)
+
+ ADD_LIBRARY(bvpl_octree ${bvpl_octree_sources})
++SET_TARGET_PROPERTIES(bvpl_octree PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl_octree)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl/bvpl_octree ${bvpl_octree_sources})
+
+ TARGET_LINK_LIBRARIES(bvpl_octree bvpl boxm_io vbl)
+
+Index: vxl-1.14.0/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -16,6 +16,9 @@
+ AUX_SOURCE_DIRECTORY(processes bvpl_octree_pro_sources)
+
+ ADD_LIBRARY(bvpl_octree_pro ${bvpl_octree_pro_sources})
++SET_TARGET_PROPERTIES(bvpl_octree_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl_octree_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl/bvpl_octree/pro ${bvpl_octree_pro_sources})
+
+ TARGET_LINK_LIBRARIES(bvpl_octree_pro bvpl_octree bprb bvpl_io brdb)
+
+Index: vxl-1.14.0/contrib/brl/bseg/bvpl/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -37,6 +37,9 @@
AUX_SOURCE_DIRECTORY(Templates bvpl_sources)
ADD_LIBRARY(bvpl ${bvpl_sources})
@@ -587,13 +790,67 @@
+INSTALL_TARGETS(/lib bvpl)
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl ${bvpl_sources})
- TARGET_LINK_LIBRARIES(bvpl bvpl_kernels bvpl_functors bvxm_grid bdgl bsta vnl vnl_io vil_algo vgl vpl vul vbl_io vsl vbl)
+ TARGET_LINK_LIBRARIES(bvpl bvxm_grid bdgl bxml bsvg bsta vgl_algo vil_algo vnl vgl vpl vul vbl)
-Index: vxl-1.17.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bseg/bvpl/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2011-03-04 15:51:24.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
-@@ -12,6 +12,9 @@
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/io/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/io/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -8,5 +8,8 @@
+
+ ADD_LIBRARY(bvpl_io ${bvpl_io_sources})
+ TARGET_LINK_LIBRARIES(bvpl_io bvpl vsl vbl)
++SET_TARGET_PROPERTIES(bvpl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl_io)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl/io ${bvpl_io_sources})
+
+
+Index: vxl-1.14.0/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/pro/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/pro/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -18,6 +18,9 @@
+ AUX_SOURCE_DIRECTORY(processes/util bvpl_pro_sources)
+
+ ADD_LIBRARY(bvpl_pro ${bvpl_pro_sources})
++SET_TARGET_PROPERTIES(bvpl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl/pro ${bvpl_pro_sources})
+
+ TARGET_LINK_LIBRARIES(bvpl_pro bprb bvpl_io brdb bvpl_util bvpl_util_io vil_algo vnl vul)
+
+Index: vxl-1.14.0/contrib/brl/bseg/bvpl/util/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/util/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/util/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -11,6 +11,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bvpl_util_sources)
+
+ ADD_LIBRARY(bvpl_util ${bvpl_util_sources})
++SET_TARGET_PROPERTIES(bvpl_util PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl_util)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl/util ${bvpl_util_sources})
+
+ TARGET_LINK_LIBRARIES(bvpl_util bvpl brdb vil_algo vgl vnl vbl)
+
+Index: vxl-1.14.0/contrib/brl/bseg/bvpl/util/io/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/util/io/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/util/io/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -8,5 +8,7 @@
+
+ ADD_LIBRARY(bvpl_util_io ${bvpl_util_io_sources})
+ TARGET_LINK_LIBRARIES(bvpl_util_io bvpl_util vsl vbl)
+-
++SET_TARGET_PROPERTIES(bvpl_util_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvpl_util_io)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl/util/io ${bvpl_util_io_sources})
+
+Index: vxl-1.14.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -11,6 +11,9 @@
AUX_SOURCE_DIRECTORY(Templates bvxm_algo_sources)
ADD_LIBRARY( bvxm_algo ${bvxm_algo_sources})
@@ -601,13 +858,13 @@
+INSTALL_TARGETS(/lib bvxm_algo)
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvxm/algo ${bgrl_sources})
- TARGET_LINK_LIBRARIES( bvxm_algo bsta bvxm_grid_io boxm_util vnl vgl)
+ TARGET_LINK_LIBRARIES( bvxm_algo bsta bvxm_grid vnl vgl)
-Index: vxl-1.17.0/contrib/brl/bseg/sdet/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bseg/sdet/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/sdet/CMakeLists.txt 2012-02-06 17:24:28.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bseg/sdet/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
-@@ -55,6 +55,7 @@
+--- vxl-1.14.0.orig/contrib/brl/bseg/sdet/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/sdet/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -38,6 +38,7 @@
AUX_SOURCE_DIRECTORY(Templates sdet_sources)
ADD_LIBRARY(sdet ${sdet_sources})
@@ -615,11 +872,11 @@
INSTALL_TARGETS(/lib sdet)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/sdet ${sdet_sources})
-Index: vxl-1.17.0/contrib/brl/bseg/segv/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bseg/segv/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/segv/CMakeLists.txt 2011-12-13 19:34:05.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bseg/segv/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
-@@ -33,6 +33,7 @@
+--- vxl-1.14.0.orig/contrib/brl/bseg/segv/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/segv/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -36,6 +36,7 @@
)
ADD_LIBRARY(segv ${segv_sources})
@@ -627,10 +884,46 @@
INSTALL_TARGETS(/lib segv)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/segv ${segv_sources})
-Index: vxl-1.17.0/contrib/gel/geml/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bseg/strk/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/geml/CMakeLists.txt 2010-09-26 06:37:58.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/geml/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bseg/strk/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/strk/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -39,6 +39,7 @@
+ ENDIF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
+
+ ADD_LIBRARY(strk ${strk_sources})
++SET_TARGET_PROPERTIES(strk PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib strk)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/strk ${strk_sources})
+
+Index: vxl-1.14.0/contrib/brl/bseg/vpro/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/vpro/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/vpro/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -45,6 +45,7 @@
+ ENDIF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
+
+ ADD_LIBRARY(vpro ${vpro_sources})
++SET_TARGET_PROPERTIES(vpro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vpro)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/vpro ${vpro_sources})
+
+Index: vxl-1.14.0/contrib/brl/vvid/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/vvid/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/vvid/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -49,6 +49,7 @@
+ ELSE(HAS_CMU1394CAMERA)
+ ADD_LIBRARY(vvid ${vvid_sources})
+ ENDIF(HAS_CMU1394CAMERA)
++ SET_TARGET_PROPERTIES(vvid PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+
+ INSTALL_TARGETS(/lib vvid)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/vvid ${vvid_sources})
+Index: vxl-1.14.0/contrib/gel/geml/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/gel/geml/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/geml/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -12,6 +12,7 @@
)
@@ -639,10 +932,10 @@
INSTALL_TARGETS(/lib geml)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/geml ${geml_sources})
TARGET_LINK_LIBRARIES(geml vil1 vnl)
-Index: vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/gevd/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gevd/CMakeLists.txt 2009-12-26 15:49:35.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
+--- vxl-1.14.0.orig/contrib/gel/gevd/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/gevd/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -33,6 +33,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -651,10 +944,10 @@
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)
-Index: vxl-1.17.0/contrib/gel/gkll/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/gkll/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gkll/CMakeLists.txt 2012-01-13 14:02:10.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/gkll/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
+--- vxl-1.14.0.orig/contrib/gel/gkll/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/gkll/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -20,6 +20,7 @@
ENDIF(BUILD_OXL)
@@ -663,10 +956,10 @@
INSTALL_TARGETS(/lib gkll)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gkll ${gkll_sources})
-Index: vxl-1.17.0/contrib/gel/gmvl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/gmvl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gmvl/CMakeLists.txt 2010-09-26 06:37:58.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/gmvl/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
+--- vxl-1.14.0.orig/contrib/gel/gmvl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/gmvl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -21,6 +21,7 @@
AUX_SOURCE_DIRECTORY(Templates gmvl_sources)
@@ -675,10 +968,10 @@
INSTALL_TARGETS(/lib gmvl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gmvl ${gmvl_sources})
TARGET_LINK_LIBRARIES(gmvl vtol vil1 vnl vbl vcl)
-Index: vxl-1.17.0/contrib/gel/gst/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/gst/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gst/CMakeLists.txt 2010-09-26 06:37:58.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/gst/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
+--- vxl-1.14.0.orig/contrib/gel/gst/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -17,6 +17,7 @@
AUX_SOURCE_DIRECTORY(Templates gst_sources)
@@ -687,10 +980,10 @@
INSTALL_TARGETS(/lib gst)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gst ${gst_sources})
-Index: vxl-1.17.0/contrib/gel/gtrl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/gtrl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gtrl/CMakeLists.txt 2011-05-22 14:50:44.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/gtrl/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
+--- vxl-1.14.0.orig/contrib/gel/gtrl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/gtrl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -25,6 +25,7 @@
ENDIF(NETLIB_FOUND)
@@ -699,10 +992,86 @@
INSTALL_TARGETS(/lib gtrl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gtrl ${gtrl_sources})
-Index: vxl-1.17.0/contrib/gel/vgel/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/mrc/vpgl/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vgel/CMakeLists.txt 2012-01-12 14:46:48.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/vgel/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -39,6 +39,9 @@
+
+ ADD_LIBRARY(vpgl_algo ${vpgl_algo_sources})
+ TARGET_LINK_LIBRARIES( vpgl_algo vpgl vpgl_file_formats rrel vsol bgeo vgl_algo vnl_algo vnl vgl vil vul )
++SET_TARGET_PROPERTIES(vpgl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib vpgl_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/mrc/vpgl/algo ${vpgl_algo_sources})
+
+ IF( BUILD_TESTING )
+ SUBDIRS(tests)
+Index: vxl-1.14.0/contrib/gel/mrc/vpgl/bgeo/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/bgeo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/bgeo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -12,6 +12,7 @@
+ AUX_SOURCE_DIRECTORY(Templates bgeo_sources)
+
+ ADD_LIBRARY(bgeo ${bgeo_sources})
++SET_TARGET_PROPERTIES(bgeo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib bgeo)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/mrc/vpgl/bgeo ${bgeo_sources})
+
+Index: vxl-1.14.0/contrib/gel/mrc/vpgl/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -30,6 +30,9 @@
+ AUX_SOURCE_DIRECTORY(Templates vpgl_sources)
+
+ ADD_LIBRARY(vpgl ${vpgl_sources})
++SET_TARGET_PROPERTIES(vpgl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib vpgl)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/mrc/vpgl ${vpgl_sources})
+ TARGET_LINK_LIBRARIES( vpgl vnl vnl_algo vnl_io vgl vgl_algo vgl_io vsl bgeo vbl)
+
+ IF( BUILD_TESTING )
+Index: vxl-1.14.0/contrib/gel/mrc/vpgl/file_formats/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/file_formats/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/file_formats/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -23,5 +23,8 @@
+ ENDIF(TIFF_FOUND)
+
+ ADD_LIBRARY(vpgl_file_formats ${vpgl_file_formats_sources})
++SET_TARGET_PROPERTIES(vpgl_file_formats PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib vpgl_file_formats)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/mrc/vpgl/file_formats ${vpgl_file_formats_sources})
+
+ TARGET_LINK_LIBRARIES(vpgl_file_formats vpgl vil vnl)
+Index: vxl-1.14.0/contrib/gel/mrc/vpgl/io/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/io/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/io/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -12,3 +12,6 @@
+
+ ADD_LIBRARY(vpgl_io ${vpgl_io_sources})
+ TARGET_LINK_LIBRARIES(vpgl_io vsl vpgl vnl vnl_io)
++SET_TARGET_PROPERTIES(vpgl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib vpgl_io)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/mrc/vpgl/io ${vpgl_io_sources})
+Index: vxl-1.14.0/contrib/gel/mrc/vpgl/xio/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/xio/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/xio/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -7,6 +7,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vpgl_xio_sources)
+
+ ADD_LIBRARY(vpgl_xio ${vpgl_xio_sources})
++SET_TARGET_PROPERTIES(vpgl_xio PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vpgl_xio vpgl vgl_xio vgl vsl)
+
+ INSTALL_TARGETS(/lib vpgl_xio)
+Index: vxl-1.14.0/contrib/gel/vgel/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/gel/vgel/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vgel/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -20,6 +20,7 @@
ENDIF(BUILD_OXL)
@@ -711,10 +1080,10 @@
INSTALL_TARGETS(/lib vgel)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vgel ${vgel_sources})
-Index: vxl-1.17.0/contrib/gel/vgel/kl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/vgel/kl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vgel/kl/CMakeLists.txt 2012-01-12 14:46:48.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/vgel/kl/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
+--- vxl-1.14.0.orig/contrib/gel/vgel/kl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vgel/kl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -15,6 +15,7 @@
)
@@ -723,10 +1092,10 @@
INSTALL_TARGETS(/lib vgel_kl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vgel/kl ${vgel_kl_sources})
-Index: vxl-1.17.0/contrib/gel/vifa/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/vifa/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vifa/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/vifa/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
+--- vxl-1.14.0.orig/contrib/gel/vifa/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vifa/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -31,6 +31,7 @@
AUX_SOURCE_DIRECTORY(Templates vifa_sources)
@@ -735,22 +1104,22 @@
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)
-Index: vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vmal/CMakeLists.txt 2012-01-12 17:57:48.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
-@@ -37,6 +37,7 @@
+--- vxl-1.14.0.orig/contrib/gel/vmal/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -35,6 +35,7 @@
+ ENDIF(BUILD_OXL)
-
ADD_LIBRARY(vmal ${vmal_sources})
+SET_TARGET_PROPERTIES(vmal PROPERTIES ${VNL_LIBRARY_PROPERTIES})
INSTALL_TARGETS(/lib vmal)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vmal ${vmal_sources})
-Index: vxl-1.17.0/contrib/gel/vsol/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/vsol/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vsol/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/vsol/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
+--- vxl-1.14.0.orig/contrib/gel/vsol/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vsol/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -63,6 +63,7 @@
AUX_SOURCE_DIRECTORY(Templates vsol_sources)
@@ -759,10 +1128,10 @@
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)
-Index: vxl-1.17.0/contrib/gel/vsrl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/gel/vsrl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vsrl/CMakeLists.txt 2012-01-12 17:58:06.000000000 +0000
-+++ vxl-1.17.0/contrib/gel/vsrl/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
+--- vxl-1.14.0.orig/contrib/gel/vsrl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vsrl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -60,6 +60,7 @@
ENDIF (HAS_VGUI)
@@ -771,10 +1140,10 @@
INSTALL_TARGETS(/lib vsrl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vsrl ${vsrl_sources})
-Index: vxl-1.17.0/contrib/mul/ipts/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/ipts/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/ipts/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/ipts/CMakeLists.txt 2012-06-05 16:53:19.104825333 +0000
+--- vxl-1.14.0.orig/contrib/mul/ipts/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/ipts/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -16,6 +16,7 @@
)
@@ -783,11 +1152,11 @@
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)
-Index: vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/mbl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mbl/CMakeLists.txt 2010-08-31 12:28:12.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
-@@ -121,6 +121,7 @@
+--- vxl-1.14.0.orig/contrib/mul/mbl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/mbl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -118,6 +118,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ADD_LIBRARY(mbl ${mbl_sources})
@@ -795,10 +1164,24 @@
TARGET_LINK_LIBRARIES(mbl vnl_io vnl_algo vgl_io vgl vbl_io vil_io vsl vnl vil vul vbl)
INSTALL_TARGETS(/lib mbl)
-Index: vxl-1.17.0/contrib/mul/mil/algo/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/mcal/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mil/algo/CMakeLists.txt 2011-03-15 15:57:23.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/mil/algo/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/mul/mcal/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/mcal/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -19,6 +19,9 @@
+ AUX_SOURCE_DIRECTORY(Templates mcal_sources)
+
+ ADD_LIBRARY(mcal ${mcal_sources})
++SET_TARGET_PROPERTIES(mcal PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib mcal)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mcal ${mcal_sources})
+ TARGET_LINK_LIBRARIES(mcal mbl vnl vnl_algo vul)
+
+ IF (BUILD_TESTING)
+Index: vxl-1.14.0/contrib/mul/mil/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/mul/mil/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/mil/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -15,6 +15,7 @@
AUX_SOURCE_DIRECTORY(Templates mil_algo_sources)
@@ -807,10 +1190,10 @@
INSTALL_TARGETS(/lib mil_algo)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mil/algo ${mil_algo_sources})
TARGET_LINK_LIBRARIES(mil_algo mil mbl vnl vsl)
-Index: vxl-1.17.0/contrib/mul/mil/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/mil/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mil/CMakeLists.txt 2009-09-20 14:33:42.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/mil/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/mul/mil/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/mil/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -37,6 +37,7 @@
AUX_SOURCE_DIRECTORY(Templates mil_sources)
@@ -819,10 +1202,10 @@
INSTALL_TARGETS(/lib mil)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mil ${mil_sources})
TARGET_LINK_LIBRARIES(mil mbl vimt vnl vbl_io vgl vil1 vbl vsl)
-Index: vxl-1.17.0/contrib/mul/mil3d/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/mil3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mil3d/CMakeLists.txt 2009-09-20 14:33:42.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/mil3d/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/mul/mil3d/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/mil3d/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -20,6 +20,7 @@
AUX_SOURCE_DIRECTORY(Templates mil3d_sources)
@@ -831,22 +1214,22 @@
INSTALL_TARGETS(/lib mil3d)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mil3d ${mil3d_sources})
TARGET_LINK_LIBRARIES(mil3d mil vbl_io vnl_io vnl vgl vbl vsl)
-Index: vxl-1.17.0/contrib/mul/mvl2/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/mvl2/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mvl2/CMakeLists.txt 2010-09-26 06:37:58.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/mvl2/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
-@@ -52,6 +52,7 @@
- ENDIF (AVIFILE_FOUND)
+--- vxl-1.14.0.orig/contrib/mul/mvl2/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/mvl2/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -53,6 +53,7 @@
+
ADD_LIBRARY(mvl2 ${mvl2_sources})
+SET_TARGET_PROPERTIES(mvl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
INSTALL_TARGETS(/lib mvl2)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mvl2 ${mvl2_sources})
TARGET_LINK_LIBRARIES( mvl2 vil vul ${AVIFILE_LIBRARIES} )
-Index: vxl-1.17.0/contrib/mul/pdf1d/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/pdf1d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/pdf1d/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/pdf1d/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/mul/pdf1d/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/pdf1d/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -49,6 +49,7 @@
AUX_SOURCE_DIRECTORY(Templates pdf1d_sources)
@@ -855,10 +1238,10 @@
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 )
-Index: vxl-1.17.0/contrib/mul/vil3d/algo/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/vil3d/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vil3d/algo/CMakeLists.txt 2011-03-15 15:57:23.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/vil3d/algo/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/mul/vil3d/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vil3d/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -36,6 +36,7 @@
AUX_SOURCE_DIRECTORY(Templates vil3d_algo_sources)
@@ -867,11 +1250,11 @@
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 )
-Index: vxl-1.17.0/contrib/mul/vil3d/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/vil3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vil3d/CMakeLists.txt 2010-09-13 15:46:16.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/vil3d/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
-@@ -49,6 +49,7 @@
+--- vxl-1.14.0.orig/contrib/mul/vil3d/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vil3d/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -48,6 +48,7 @@
AUX_SOURCE_DIRECTORY(Templates vil3d_sources)
ADD_LIBRARY(vil3d ${vil3d_sources})
@@ -879,10 +1262,10 @@
TARGET_LINK_LIBRARIES( vil3d vil vul vsl vcl vnl )
INSTALL_TARGETS(/lib vil3d)
-Index: vxl-1.17.0/contrib/mul/vil3d/io/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/vil3d/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vil3d/io/CMakeLists.txt 2006-10-17 13:03:35.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/vil3d/io/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/mul/vil3d/io/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vil3d/io/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -7,6 +7,7 @@
)
@@ -891,10 +1274,10 @@
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 )
-Index: vxl-1.17.0/contrib/mul/vimt/algo/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/vimt/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vimt/algo/CMakeLists.txt 2011-03-15 15:57:23.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/vimt/algo/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/mul/vimt/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vimt/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -11,6 +11,7 @@
)
@@ -903,10 +1286,10 @@
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 )
-Index: vxl-1.17.0/contrib/mul/vimt/CMakeLists.txt
+Index: vxl-1.14.0/contrib/mul/vimt/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vimt/CMakeLists.txt 2010-10-05 06:29:06.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/vimt/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/mul/vimt/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vimt/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -35,6 +35,7 @@
AUX_SOURCE_DIRECTORY(Templates vimt_sources)
@@ -914,23 +1297,23 @@
+SET_TARGET_PROPERTIES(vimt PROPERTIES ${VNL_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 )
-Index: vxl-1.17.0/contrib/mul/vimt3d/CMakeLists.txt
+ TARGET_LINK_LIBRARIES(vimt mbl vil_algo vgl vnl vil )
+Index: vxl-1.14.0/contrib/mul/vimt3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vimt3d/CMakeLists.txt 2010-07-08 16:39:51.000000000 +0000
-+++ vxl-1.17.0/contrib/mul/vimt3d/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
-@@ -34,6 +34,7 @@
+--- vxl-1.14.0.orig/contrib/mul/vimt3d/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vimt3d/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -33,6 +33,7 @@
AUX_SOURCE_DIRECTORY(Templates vimt3d_sources)
ADD_LIBRARY(vimt3d ${vimt3d_sources})
+SET_TARGET_PROPERTIES(vimt3d PROPERTIES ${VNL_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)
-Index: vxl-1.17.0/contrib/oul/ouel/CMakeLists.txt
+ TARGET_LINK_LIBRARIES(vimt3d vil3d_algo vil3d_io vil3d vimt mbl vgl vnl_io vnl vil vsl vul)
+Index: vxl-1.14.0/contrib/oul/ouel/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oul/ouel/CMakeLists.txt 2010-09-26 06:37:58.000000000 +0000
-+++ vxl-1.17.0/contrib/oul/ouel/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/oul/ouel/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/oul/ouel/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -11,6 +11,7 @@
)
@@ -939,10 +1322,10 @@
INSTALL_TARGETS(/lib ouel)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul/ouel ${ouel_sources})
TARGET_LINK_LIBRARIES( ouel vnl_algo vnl )
-Index: vxl-1.17.0/contrib/oul/oufgl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/oul/oufgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oul/oufgl/CMakeLists.txt 2010-09-26 06:37:58.000000000 +0000
-+++ vxl-1.17.0/contrib/oul/oufgl/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/oul/oufgl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/oul/oufgl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -15,6 +15,7 @@
)
@@ -951,10 +1334,10 @@
INSTALL_TARGETS(/lib oufgl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul/oufgl ${oufgl_sources})
TARGET_LINK_LIBRARIES( oufgl vil vil1 rt)
-Index: vxl-1.17.0/contrib/oul/ouml/CMakeLists.txt
+Index: vxl-1.14.0/contrib/oul/ouml/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oul/ouml/CMakeLists.txt 2010-09-26 06:37:58.000000000 +0000
-+++ vxl-1.17.0/contrib/oul/ouml/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/oul/ouml/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/oul/ouml/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -20,6 +20,7 @@
)
@@ -963,10 +1346,10 @@
INSTALL_TARGETS(/lib ouml)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul/ouml ${ouml_sources})
TARGET_LINK_LIBRARIES( ouml vgl vnl_algo vnl_io vnl vil1 vsl vpl )
-Index: vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oxl/osl/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/oxl/osl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -45,6 +45,7 @@
AUX_SOURCE_DIRECTORY(Templates osl_sources)
@@ -975,10 +1358,23 @@
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)
-Index: vxl-1.17.0/contrib/prip/vmap/CMakeLists.txt
+Index: vxl-1.14.0/contrib/oxl/vrml/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/prip/vmap/CMakeLists.txt 2006-10-17 13:03:35.000000000 +0000
-+++ vxl-1.17.0/contrib/prip/vmap/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/oxl/vrml/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/oxl/vrml/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -10,4 +10,8 @@
+ )
+
+ ADD_LIBRARY(vrml ${vrml_sources})
++SET_TARGET_PROPERTIES(vrml PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES(vrml vul)
++INSTALL_TARGETS(/lib vrml)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/vrml ${vrml_sources})
++
+Index: vxl-1.14.0/contrib/prip/vmap/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/prip/vmap/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/prip/vmap/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -28,6 +28,7 @@
)
@@ -987,10 +1383,10 @@
INSTALL_TARGETS(/lib vmap)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vmap ${vmap_sources})
TARGET_LINK_LIBRARIES(vmap vcl)
-Index: vxl-1.17.0/contrib/rpl/rgrl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/rpl/rgrl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/rpl/rgrl/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/contrib/rpl/rgrl/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/rpl/rgrl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/rpl/rgrl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -161,6 +161,7 @@
AUX_SOURCE_DIRECTORY( Templates rgrl_sources )
@@ -999,10 +1395,10 @@
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)
-Index: vxl-1.17.0/contrib/rpl/rgtl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/rpl/rgtl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/rpl/rgtl/CMakeLists.txt 2009-03-07 06:44:51.000000000 +0000
-+++ vxl-1.17.0/contrib/rpl/rgtl/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/rpl/rgtl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/rpl/rgtl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -84,6 +84,7 @@
)
@@ -1011,10 +1407,22 @@
TARGET_LINK_LIBRARIES(rgtl vnl_algo vnl vcl)
INSTALL_TARGETS(/lib rgtl)
-Index: vxl-1.17.0/contrib/rpl/rtvl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/rpl/rrel/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/rpl/rtvl/CMakeLists.txt 2010-09-26 06:37:58.000000000 +0000
-+++ vxl-1.17.0/contrib/rpl/rtvl/CMakeLists.txt 2012-06-05 16:53:19.108825333 +0000
+--- vxl-1.14.0.orig/contrib/rpl/rrel/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/rpl/rrel/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -44,6 +44,7 @@
+ AUX_SOURCE_DIRECTORY(Templates rrel_sources)
+
+ ADD_LIBRARY(rrel ${rrel_sources})
++SET_TARGET_PROPERTIES(rrel PROPERTIES ${VNL_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)
+Index: vxl-1.14.0/contrib/rpl/rtvl/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/rpl/rtvl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/rpl/rtvl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -41,6 +41,7 @@
)
@@ -1023,22 +1431,34 @@
TARGET_LINK_LIBRARIES(rtvl rgtl vnl_algo vnl)
INSTALL_TARGETS(/lib rtvl)
-Index: vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt
+Index: vxl-1.14.0/contrib/tbl/vepl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/tbl/vepl/CMakeLists.txt 2011-12-27 14:15:45.000000000 +0000
-+++ vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
-@@ -52,6 +52,7 @@
+--- vxl-1.14.0.orig/contrib/tbl/vepl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/tbl/vepl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -45,6 +45,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ADD_LIBRARY(vepl ${vepl_sources})
+SET_TARGET_PROPERTIES(vepl PROPERTIES ${VNL_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})
-Index: vxl-1.17.0/core/testlib/CMakeLists.txt
+ TARGET_LINK_LIBRARIES(vepl vipl vil1 ${CMAKE_THREAD_LIBS})
+Index: vxl-1.14.0/contrib/tbl/vepl2/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/testlib/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/core/testlib/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
+--- vxl-1.14.0.orig/contrib/tbl/vepl2/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/tbl/vepl2/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -52,6 +52,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ ADD_LIBRARY(vepl2 ${vepl2_sources})
++SET_TARGET_PROPERTIES(vepl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vepl2)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vepl2 ${vepl2_sources})
+ TARGET_LINK_LIBRARIES(vepl2 vipl vil ${CMAKE_THREAD_LIBS})
+Index: vxl-1.14.0/core/testlib/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/core/testlib/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/testlib/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -29,6 +29,7 @@
)
@@ -1047,11 +1467,11 @@
TARGET_LINK_LIBRARIES( testlib vcl )
INSTALL_TARGETS( /lib testlib)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/testlib ${testlib_sources})
-Index: vxl-1.17.0/core/vbl/CMakeLists.txt
+Index: vxl-1.14.0/core/vbl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vbl/CMakeLists.txt 2011-12-16 22:41:06.000000000 +0000
-+++ vxl-1.17.0/core/vbl/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
-@@ -42,6 +42,7 @@
+--- vxl-1.14.0.orig/core/vbl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vbl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -38,6 +38,7 @@
AUX_SOURCE_DIRECTORY(Templates vbl_sources)
ADD_LIBRARY(vbl ${vbl_sources})
@@ -1059,10 +1479,10 @@
TARGET_LINK_LIBRARIES( vbl vcl )
INSTALL_TARGETS(/lib vbl)
-Index: vxl-1.17.0/core/vbl/io/CMakeLists.txt
+Index: vxl-1.14.0/core/vbl/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vbl/io/CMakeLists.txt 2006-10-17 13:03:35.000000000 +0000
-+++ vxl-1.17.0/core/vbl/io/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
+--- vxl-1.14.0.orig/core/vbl/io/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vbl/io/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -17,6 +17,7 @@
AUX_SOURCE_DIRECTORY(Templates vbl_io_sources)
@@ -1071,10 +1491,10 @@
TARGET_LINK_LIBRARIES( vbl_io vbl vsl )
INSTALL_TARGETS(/lib vbl_io)
-Index: vxl-1.17.0/core/vcsl/CMakeLists.txt
+Index: vxl-1.14.0/core/vcsl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vcsl/CMakeLists.txt 2009-05-13 19:46:07.000000000 +0000
-+++ vxl-1.17.0/core/vcsl/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
+--- vxl-1.14.0.orig/core/vcsl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vcsl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -63,6 +63,7 @@
AUX_SOURCE_DIRECTORY( Templates vcsl_sources )
@@ -1083,11 +1503,11 @@
TARGET_LINK_LIBRARIES( vcsl vnl vbl )
INSTALL_TARGETS(/lib vcsl)
-Index: vxl-1.17.0/core/vgl/CMakeLists.txt
+Index: vxl-1.14.0/core/vgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgl/CMakeLists.txt 2010-09-17 19:49:56.000000000 +0000
-+++ vxl-1.17.0/core/vgl/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
-@@ -69,6 +69,7 @@
+--- vxl-1.14.0.orig/core/vgl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vgl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -68,6 +68,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_sources)
ADD_LIBRARY(vgl ${vgl_sources})
@@ -1095,11 +1515,11 @@
TARGET_LINK_LIBRARIES( vgl vcl )
doxygen_add_library(core/vgl
#DEPENDS core/vsl core/vnl
-Index: vxl-1.17.0/core/vgl/io/CMakeLists.txt
+Index: vxl-1.14.0/core/vgl/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgl/io/CMakeLists.txt 2010-08-25 16:11:07.000000000 +0000
-+++ vxl-1.17.0/core/vgl/io/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
-@@ -29,6 +29,7 @@
+--- vxl-1.14.0.orig/core/vgl/io/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vgl/io/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -28,6 +28,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_io_sources)
ADD_LIBRARY(vgl_io ${vgl_io_sources})
@@ -1107,11 +1527,23 @@
TARGET_LINK_LIBRARIES( vgl_io vgl vsl )
INSTALL_TARGETS(/lib vgl_io)
-Index: vxl-1.17.0/core/vgui/CMakeLists.txt
+Index: vxl-1.14.0/core/vgl/xio/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgui/CMakeLists.txt 2011-05-22 14:50:44.000000000 +0000
-+++ vxl-1.17.0/core/vgui/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
-@@ -518,6 +518,7 @@
+--- vxl-1.14.0.orig/core/vgl/xio/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vgl/xio/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -10,6 +10,7 @@
+ AUX_SOURCE_DIRECTORY(Templates vgl_xio_sources)
+
+ ADD_LIBRARY(vgl_xio ${vgl_xio_sources})
++SET_TARGET_PROPERTIES(vgl_xio PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vgl_xio vgl vsl )
+
+ INSTALL_TARGETS(/lib vgl_xio)
+Index: vxl-1.14.0/core/vgui/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/core/vgui/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vgui/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -488,6 +488,7 @@
)
ADD_LIBRARY(vgui ${vgui_sources})
@@ -1119,10 +1551,10 @@
INSTALL_TARGETS(/lib vgui)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vgui ${vgui_sources})
SET( VGUI_FOUND "YES" CACHE INTERNAL "Was vgui successfully built?" )
-Index: vxl-1.17.0/core/vgui/wx/CMakeLists.txt
+Index: vxl-1.14.0/core/vgui/wx/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgui/wx/CMakeLists.txt 2011-11-27 09:50:40.000000000 +0000
-+++ vxl-1.17.0/core/vgui/wx/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
+--- vxl-1.14.0.orig/core/vgui/wx/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vgui/wx/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -24,6 +24,7 @@
)
@@ -1130,12 +1562,12 @@
+SET_TARGET_PROPERTIES(vgui_wx PROPERTIES ${VNL_LIBRARY_PROPERTIES})
TARGET_LINK_LIBRARIES(vgui_wx vgui ${wxWidgets_LIBRARIES})
- IF (BUILD_TESTING)
-Index: vxl-1.17.0/core/vidl/CMakeLists.txt
+ ENDIF(wxWidgets_FOUND)
+Index: vxl-1.14.0/core/vidl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vidl/CMakeLists.txt 2011-12-17 18:52:25.000000000 +0000
-+++ vxl-1.17.0/core/vidl/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
-@@ -128,6 +128,7 @@
+--- vxl-1.14.0.orig/core/vidl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vidl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -127,6 +127,7 @@
AUX_SOURCE_DIRECTORY(Templates vidl_sources)
ADD_LIBRARY(vidl ${vidl_sources})
@@ -1143,23 +1575,47 @@
INSTALL_TARGETS(/lib vidl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl ${vidl_sources})
-Index: vxl-1.17.0/core/vidl/gui/CMakeLists.txt
+Index: vxl-1.14.0/core/vidl/gui/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vidl/gui/CMakeLists.txt 2011-05-22 14:50:44.000000000 +0000
-+++ vxl-1.17.0/core/vidl/gui/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
+--- vxl-1.14.0.orig/core/vidl/gui/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vidl/gui/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -12,6 +12,7 @@
- )
+ )
ADD_LIBRARY(vidl_gui ${vidl_gui_sources})
+SET_TARGET_PROPERTIES(vidl_gui PROPERTIES ${VNL_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 )
-Index: vxl-1.17.0/core/vil/algo/CMakeLists.txt
+Index: vxl-1.14.0/core/vidl1/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil/algo/CMakeLists.txt 2011-04-20 17:05:57.000000000 +0000
-+++ vxl-1.17.0/core/vil/algo/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
-@@ -57,6 +57,7 @@
+--- vxl-1.14.0.orig/core/vidl1/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vidl1/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -89,6 +89,7 @@
+
+
+ ADD_LIBRARY(vidl1 ${vidl1_sources})
++SET_TARGET_PROPERTIES(vidl1 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vidl1)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl1 ${vidl1_sources})
+
+Index: vxl-1.14.0/core/vidl_vil1/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/core/vidl_vil1/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vidl_vil1/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -40,6 +40,7 @@
+ ENDIF( WIN32 )
+
+ ADD_LIBRARY(vidl_vil1 ${vidl_vil1_sources})
++SET_TARGET_PROPERTIES(vidl_vil1 PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ INSTALL_TARGETS(/lib vidl_vil1)
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl_vil1 ${vidl_vil1_sources})
+ TARGET_LINK_LIBRARIES( vidl_vil1 vbl vul vil1 vcl )
+Index: vxl-1.14.0/core/vil/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/core/vil/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vil/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -59,6 +59,7 @@
AUX_SOURCE_DIRECTORY(Templates vil_algo_sources)
ADD_LIBRARY(vil_algo ${vil_algo_sources})
@@ -1167,11 +1623,11 @@
TARGET_LINK_LIBRARIES( vil_algo vil vnl_algo vnl vcl )
-Index: vxl-1.17.0/core/vil/CMakeLists.txt
+Index: vxl-1.14.0/core/vil/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil/CMakeLists.txt 2011-05-22 14:50:44.000000000 +0000
-+++ vxl-1.17.0/core/vil/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
-@@ -340,6 +340,7 @@
+--- vxl-1.14.0.orig/core/vil/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vil/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -311,6 +311,7 @@
TARGET_LINK_LIBRARIES( vil nsl vil_network socket )
ENDIF (SOLARIS)
@@ -1179,11 +1635,11 @@
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil
${vil_sources}
${vil_network_sources}
-Index: vxl-1.17.0/core/vil/io/CMakeLists.txt
+Index: vxl-1.14.0/core/vil/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil/io/CMakeLists.txt 2011-03-16 15:00:16.000000000 +0000
-+++ vxl-1.17.0/core/vil/io/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
-@@ -15,6 +15,7 @@
+--- vxl-1.14.0.orig/core/vil/io/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vil/io/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -14,6 +14,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ADD_LIBRARY(vil_io ${vil_io_sources})
@@ -1191,10 +1647,10 @@
TARGET_LINK_LIBRARIES( vil_io vil vsl )
INSTALL_TARGETS(/lib vil_io)
-Index: vxl-1.17.0/core/vil1/CMakeLists.txt
+Index: vxl-1.14.0/core/vil1/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil1/CMakeLists.txt 2011-05-22 14:50:44.000000000 +0000
-+++ vxl-1.17.0/core/vil1/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
+--- vxl-1.14.0.orig/core/vil1/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vil1/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -169,6 +169,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1203,10 +1659,10 @@
INSTALL_TARGETS(/lib vil1)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1 ${vil1_sources})
-Index: vxl-1.17.0/core/vil1/io/CMakeLists.txt
+Index: vxl-1.14.0/core/vil1/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil1/io/CMakeLists.txt 2008-02-24 14:55:44.000000000 +0000
-+++ vxl-1.17.0/core/vil1/io/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
+--- vxl-1.14.0.orig/core/vil1/io/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vil1/io/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -15,6 +15,7 @@
AUX_SOURCE_DIRECTORY(Templates vil1_io_sources)
@@ -1215,11 +1671,11 @@
TARGET_LINK_LIBRARIES( vil1_io vil1 vsl )
INSTALL_TARGETS(/lib vil1_io)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1/io ${vil1_io_sources})
-Index: vxl-1.17.0/core/vnl/algo/CMakeLists.txt
+Index: vxl-1.14.0/core/vnl/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vnl/algo/CMakeLists.txt 2011-05-22 14:50:44.000000000 +0000
-+++ vxl-1.17.0/core/vnl/algo/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
-@@ -102,6 +102,7 @@
+--- vxl-1.14.0.orig/core/vnl/algo/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vnl/algo/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -100,6 +100,7 @@
AUX_SOURCE_DIRECTORY(Templates vnl_algo_sources)
ADD_LIBRARY( vnl_algo ${vnl_algo_sources})
@@ -1227,11 +1683,11 @@
TARGET_LINK_LIBRARIES( vnl_algo ${NETLIB_LIBRARIES} vnl )
INSTALL_TARGETS(/lib vnl_algo)
-Index: vxl-1.17.0/core/vnl/CMakeLists.txt
+Index: vxl-1.14.0/core/vnl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vnl/CMakeLists.txt 2011-10-04 19:41:57.000000000 +0000
-+++ vxl-1.17.0/core/vnl/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
-@@ -264,6 +264,7 @@
+--- vxl-1.14.0.orig/core/vnl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vnl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -257,6 +257,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ADD_LIBRARY(vnl ${vnl_sources})
@@ -1239,10 +1695,10 @@
TARGET_LINK_LIBRARIES( vnl vcl )
INSTALL_TARGETS(/lib vnl)
-Index: vxl-1.17.0/core/vnl/io/CMakeLists.txt
+Index: vxl-1.14.0/core/vnl/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vnl/io/CMakeLists.txt 2006-10-17 13:03:35.000000000 +0000
-+++ vxl-1.17.0/core/vnl/io/CMakeLists.txt 2012-06-05 16:53:19.112825333 +0000
+--- vxl-1.14.0.orig/core/vnl/io/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vnl/io/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -26,6 +26,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1251,11 +1707,11 @@
TARGET_LINK_LIBRARIES( vnl_io vnl vsl )
INSTALL_TARGETS(/lib vnl_io)
-Index: vxl-1.17.0/core/vnl/xio/CMakeLists.txt
+Index: vxl-1.14.0/core/vnl/xio/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vnl/xio/CMakeLists.txt 2011-07-29 21:32:53.000000000 +0000
-+++ vxl-1.17.0/core/vnl/xio/CMakeLists.txt 2012-06-05 16:53:19.116825333 +0000
-@@ -11,6 +11,7 @@
+--- vxl-1.14.0.orig/core/vnl/xio/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vnl/xio/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -10,6 +10,7 @@
AUX_SOURCE_DIRECTORY(Templates vnl_xio_sources)
ADD_LIBRARY(vnl_xio ${vnl_xio_sources} )
@@ -1263,10 +1719,10 @@
TARGET_LINK_LIBRARIES( vnl_xio vnl vsl )
INSTALL_TARGETS(/lib vnl_xio)
-Index: vxl-1.17.0/core/vpdl/CMakeLists.txt
+Index: vxl-1.14.0/core/vpdl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vpdl/CMakeLists.txt 2010-03-01 18:40:31.000000000 +0000
-+++ vxl-1.17.0/core/vpdl/CMakeLists.txt 2012-06-05 16:53:19.116825333 +0000
+--- vxl-1.14.0.orig/core/vpdl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vpdl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -48,6 +48,7 @@
AUX_SOURCE_DIRECTORY(Templates vpdl_sources)
@@ -1275,11 +1731,23 @@
TARGET_LINK_LIBRARIES( vpdl vnl_algo vnl )
INSTALL_TARGETS(/lib vpdl)
-Index: vxl-1.17.0/core/vsl/CMakeLists.txt
+Index: vxl-1.14.0/core/vpl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vsl/CMakeLists.txt 2010-06-21 16:41:49.000000000 +0000
-+++ vxl-1.17.0/core/vsl/CMakeLists.txt 2012-06-05 16:53:19.116825333 +0000
-@@ -36,6 +36,7 @@
+--- vxl-1.14.0.orig/core/vpl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vpl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -13,6 +13,7 @@
+ )
+
+ ADD_LIBRARY(vpl ${vpl_sources})
++SET_TARGET_PROPERTIES(vpl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ TARGET_LINK_LIBRARIES( vpl vcl )
+
+ INSTALL_TARGETS(/lib vpl)
+Index: vxl-1.14.0/core/vsl/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/core/vsl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vsl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -35,6 +35,7 @@
AUX_SOURCE_DIRECTORY(Templates vsl_sources)
ADD_LIBRARY(vsl ${vsl_sources})
@@ -1287,10 +1755,10 @@
TARGET_LINK_LIBRARIES( vsl vcl )
INSTALL_TARGETS(/lib vsl)
-Index: vxl-1.17.0/core/vul/io/CMakeLists.txt
+Index: vxl-1.14.0/core/vul/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vul/io/CMakeLists.txt 2006-10-17 13:03:35.000000000 +0000
-+++ vxl-1.17.0/core/vul/io/CMakeLists.txt 2012-06-05 16:53:19.116825333 +0000
+--- vxl-1.14.0.orig/core/vul/io/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/core/vul/io/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -5,6 +5,7 @@
)
@@ -1299,23 +1767,34 @@
TARGET_LINK_LIBRARIES(vul_io vul vsl)
INSTALL_TARGETS(/lib vul_io)
-Index: vxl-1.17.0/v3p/dcmtk/CMakeLists.txt
+Index: vxl-1.14.0/v3p/dcmtk/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/v3p/dcmtk/CMakeLists.txt 2011-05-22 14:50:44.000000000 +0000
-+++ vxl-1.17.0/v3p/dcmtk/CMakeLists.txt 2012-06-05 16:53:19.116825333 +0000
-@@ -453,6 +453,7 @@
+--- vxl-1.14.0.orig/v3p/dcmtk/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/v3p/dcmtk/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -455,6 +455,7 @@
TARGET_LINK_LIBRARIES( dcmtk ${ZLIB_LIBRARIES} )
ENDIF( DCMTK_HAVE_ZLIB )
+SET_TARGET_PROPERTIES(dcmtk PROPERTIES ${VNL_LIBRARY_PROPERTIES})
INSTALL_TARGETS( /lib dcmtk )
- IF( BUILD_TESTING )
-Index: vxl-1.17.0/vcl/CMakeLists.txt
+ ENDIF( VXL_BUILD_DCMTK )
+Index: vxl-1.14.0/v3p/rply/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/vcl/CMakeLists.txt 2010-04-28 21:11:33.000000000 +0000
-+++ vxl-1.17.0/vcl/CMakeLists.txt 2012-06-05 16:53:19.116825333 +0000
-@@ -360,6 +360,7 @@
+--- vxl-1.14.0.orig/v3p/rply/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/v3p/rply/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -7,3 +7,6 @@
+ )
+
+ ADD_LIBRARY(rply ${rply_sources})
++SET_TARGET_PROPERTIES(rply PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib rply)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/rply ${rply_sources})
+Index: vxl-1.14.0/vcl/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/vcl/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/vcl/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -355,6 +355,7 @@
#AUX_SOURCE_DIRECTORY(Templates vcl_sources)
ADD_LIBRARY(vcl ${vcl_sources})
@@ -1323,10 +1802,10 @@
# CMake can automatically figure out the compiler characteristics on
# Windows too. No need to do manual config.
-Index: vxl-1.17.0/contrib/brl/b3p/expatpp/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/b3p/expatpp/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/b3p/expatpp/CMakeLists.txt 2011-09-27 17:34:23.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/b3p/expatpp/CMakeLists.txt 2012-06-05 16:53:19.116825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/b3p/expatpp/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/b3p/expatpp/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -12,6 +12,9 @@
SET( expatpp_sources expatpp.h expatpp.cpp expatpplib.h )
@@ -1336,11 +1815,11 @@
+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/expatpp ${expatpp_sources})
TARGET_LINK_LIBRARIES( expatpp ${EXPAT_LIBRARIES} )
- IF( BUILD_TESTING )
-Index: vxl-1.17.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt
+ ENDIF( EXPAT_FOUND )
+Index: vxl-1.14.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-05-16 12:15:20.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-06-05 16:53:19.116825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -12,7 +12,9 @@
AUX_SOURCE_DIRECTORY(Templates bsvg_sources)
@@ -1352,10 +1831,10 @@
TARGET_LINK_LIBRARIES( bsvg bxml )
IF( BUILD_TESTING )
-Index: vxl-1.17.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2011-09-27 17:29:36.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2012-06-05 16:53:19.116825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -32,7 +32,9 @@
)
@@ -1367,10 +1846,10 @@
TARGET_LINK_LIBRARIES( bmsh3d vgl vgl_algo vnl vul)
SUBDIRS( algo )
-Index: vxl-1.17.0/contrib/brl/bpro/bprb/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bpro/bprb/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bpro/bprb/CMakeLists.txt 2011-09-27 17:30:58.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bpro/bprb/CMakeLists.txt 2012-06-05 16:53:19.116825333 +0000
+--- vxl-1.14.0.orig/contrib/brl/bpro/bprb/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/bprb/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
@@ -18,7 +18,9 @@
AUX_SOURCE_DIRECTORY(Templates bprb_sources)
@@ -1382,11 +1861,11 @@
TARGET_LINK_LIBRARIES(bprb brdb bxml vbl vsl)
IF(BUILD_TESTING)
-Index: vxl-1.17.0/contrib/brl/bbas/brdb/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/brdb/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/brdb/CMakeLists.txt 2011-09-27 17:29:36.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bbas/brdb/CMakeLists.txt 2012-06-05 16:53:19.116825333 +0000
-@@ -15,7 +15,9 @@
+--- vxl-1.14.0.orig/contrib/brl/bbas/brdb/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/brdb/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -17,7 +17,9 @@
AUX_SOURCE_DIRECTORY(Templates brdb_sources)
ADD_LIBRARY(brdb ${brdb_sources})
@@ -1395,13 +1874,58 @@
+INSTALL_TARGETS(/lib brdb)
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/brdb ${brdb_sources})
# brdb should not depend on any library that uses it
- TARGET_LINK_LIBRARIES(brdb vbl_io vbl vsl)
+ TARGET_LINK_LIBRARIES(brdb vbl vsl)
-Index: vxl-1.17.0/contrib/brl/bseg/boct/CMakeLists.txt
+Index: vxl-1.14.0/contrib/brl/bbas/imesh/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/boct/CMakeLists.txt 2011-12-26 23:39:26.000000000 +0000
-+++ vxl-1.17.0/contrib/brl/bseg/boct/CMakeLists.txt 2012-06-05 16:53:19.116825333 +0000
-@@ -14,7 +14,9 @@
+--- vxl-1.14.0.orig/contrib/brl/bbas/imesh/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/imesh/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -22,7 +22,9 @@
+ #AUX_SOURCE_DIRECTORY(Templates imesh_sources)
+
+ ADD_LIBRARY(imesh ${imesh_sources})
+-
++SET_TARGET_PROPERTIES( imesh PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib imesh)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/imesh ${imesh_sources})
+ TARGET_LINK_LIBRARIES(imesh vgl vul)
+
+ # Algorithms
+Index: vxl-1.14.0/contrib/brl/bseg/bvxm/grid/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvxm/grid/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvxm/grid/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -27,7 +27,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bvxm_grid_sources)
+
+ ADD_LIBRARY( bvxm_grid ${bvxm_grid_sources})
+-
++SET_TARGET_PROPERTIES( bvxm_grid PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvxm_grid)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvxm/grid ${bvxm_grid_sources})
+ TARGET_LINK_LIBRARIES( bvxm_grid vnl vil vil_algo vul vbl vsl vgl vgl_algo bgeo vil3d vil3d_algo)
+
+ SUBDIRS( io )
+Index: vxl-1.14.0/contrib/brl/bseg/boxm/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/boxm/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/boxm/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -54,7 +54,9 @@
+ AUX_SOURCE_DIRECTORY(Templates boxm_sources)
+
+ ADD_LIBRARY(boxm ${boxm_sources})
+-
++SET_TARGET_PROPERTIES( boxm PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib boxm)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boxm ${boxm_sources})
+ TARGET_LINK_LIBRARIES(boxm boct vgl_io vgl_xio vpgl vpgl_algo vsol bgeo bsta bsta_algo imesh expatpp vgl_algo vnl_algo vnl vgl vul vil vbl vsl vpl vcl)
+
+ #processes
+Index: vxl-1.14.0/contrib/brl/bseg/boct/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/boct/CMakeLists.txt 2011-12-20 14:43:46.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/boct/CMakeLists.txt 2011-12-20 14:46:13.000000000 +0100
+@@ -11,7 +11,9 @@
AUX_SOURCE_DIRECTORY(Templates boct_sources)
ADD_LIBRARY(boct ${boct_sources})
@@ -1412,3 +1936,45 @@
TARGET_LINK_LIBRARIES(boct vcl vgl vgl_io vnl_io vbl vnl)
#tests
+Index: vxl-1.14.0/contrib/brl/bseg/boxm/io/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/boxm/io/CMakeLists.txt 2011-12-20 14:47:54.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/boxm/io/CMakeLists.txt 2011-12-20 14:48:06.000000000 +0100
+@@ -14,7 +14,9 @@
+ AUX_SOURCE_DIRECTORY(Templates boxm_io_sources)
+
+ ADD_LIBRARY(boxm_io ${boxm_io_sources})
+-
++SET_TARGET_PROPERTIES( boxm_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib boxm_io)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boxm/io ${boxm_io_sources})
+ TARGET_LINK_LIBRARIES(boxm_io boxm ${EXPAT_LIBRARIES} expatpp)
+ IF ( APPLE )
+ TARGET_LINK_LIBRARIES(boxm_io expat)
+Index: vxl-1.14.0/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt 2011-12-20 14:48:34.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt 2011-12-20 14:48:49.000000000 +0100
+@@ -25,7 +25,9 @@
+ SET(bvxm_grid_pro_sources ${bvxm_grid_pro_sources})
+
+ ADD_LIBRARY(bvxm_grid_pro ${bvxm_grid_pro_sources})
+-
++SET_TARGET_PROPERTIES( bvxm_grid_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvxm_grid_pro)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvxm/grid/pro ${bvxm_grid_pro_sources})
+ TARGET_LINK_LIBRARIES(bvxm_grid_pro bvxm_grid bvxm_grid_io vul vgl imesh vnl)
+
+ ENDIF(EXPAT_FOUND)
+Index: vxl-1.14.0/contrib/brl/bseg/bvxm/grid/io/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvxm/grid/io/CMakeLists.txt 2011-12-20 14:49:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvxm/grid/io/CMakeLists.txt 2011-12-20 14:49:21.000000000 +0100
+@@ -12,4 +12,7 @@
+ AUX_SOURCE_DIRECTORY(Templates bvxm_grid_io_sources)
+
+ ADD_LIBRARY(bvxm_grid_io ${bvxm_grid_io_sources})
++SET_TARGET_PROPERTIES( bvxm_grid_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvxm_grid_io)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvxm/grid/io ${bvxm_grid_io_sources})
+ TARGET_LINK_LIBRARIES(bvxm_grid_io bvxm_grid bvrml vsl vbl vil vil_io vnl vgl vul)
More information about the debian-med-commit
mailing list