[med-svn] r9060 - trunk/packages/vxl/trunk/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Tue Dec 20 12:41:34 UTC 2011
Author: malat-guest
Date: 2011-12-20 12:41:34 +0000 (Tue, 20 Dec 2011)
New Revision: 9060
Modified:
trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
trunk/packages/vxl/trunk/debian/patches/vxl.soname.patch
Log:
Update patch
Modified: trunk/packages/vxl/trunk/debian/patches/renamelibs.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/renamelibs.patch 2011-12-20 10:19:02 UTC (rev 9059)
+++ trunk/packages/vxl/trunk/debian/patches/renamelibs.patch 2011-12-20 12:41:34 UTC (rev 9060)
@@ -27,7 +27,7 @@
===================================================================
--- 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,9 @@
+@@ -22,9 +22,10 @@
iowin32.c iowin32.h)
ENDIF(WIN32)
@@ -37,6 +37,7 @@
+ADD_LIBRARY( b3p_minizip ${minizip_sources} )
+SET_TARGET_PROPERTIES(b3p_minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+INSTALL_TARGETS( /lib b3p_minizip )
++TARGET_LINK_LIBRARIES(b3p_minizip z)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/minizip ${minizip_sources})
ENDIF(ZLIB_FOUND)
Modified: trunk/packages/vxl/trunk/debian/patches/vxl.soname.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/vxl.soname.patch 2011-12-20 10:19:02 UTC (rev 9059)
+++ trunk/packages/vxl/trunk/debian/patches/vxl.soname.patch 2011-12-20 12:41:34 UTC (rev 9060)
@@ -4,8 +4,8 @@
Index: vxl-1.14.0/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/CMakeLists.txt 2011-09-24 20:57:31.000000000 +0200
-+++ vxl-1.14.0/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -12,6 +12,26 @@
PROJECT(vxl)
@@ -35,8 +35,8 @@
Index: vxl-1.14.0/v3p/netlib/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/v3p/netlib/CMakeLists.txt 2011-09-24 20:57:31.000000000 +0200
-+++ vxl-1.14.0/v3p/netlib/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/v3p/netlib/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/v3p/netlib/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -8,6 +8,7 @@
)
@@ -55,8 +55,8 @@
IF(UNIX)
Index: vxl-1.14.0/contrib/rpl/rsdl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/rpl/rsdl/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/rpl/rsdl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/rpl/rsdl/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/rpl/rsdl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -21,6 +21,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -67,8 +67,8 @@
TARGET_LINK_LIBRARIES( rsdl vnl vbl )
Index: vxl-1.14.0/contrib/mul/clsfy/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/clsfy/CMakeLists.txt 2011-09-24 20:57:30.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/clsfy/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/clsfy/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/clsfy/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -53,6 +53,7 @@
AUX_SOURCE_DIRECTORY(Templates clsfy_sources)
@@ -79,8 +79,8 @@
TARGET_LINK_LIBRARIES(clsfy vpdfl mbl vnl_algo vnl_io vnl vbl vsl vul)
Index: vxl-1.14.0/contrib/mul/vpdfl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/vpdfl/CMakeLists.txt 2011-09-24 20:57:30.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/vpdfl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/vpdfl/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vpdfl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -37,6 +37,7 @@
AUX_SOURCE_DIRECTORY(Templates vpdfl_sources)
@@ -91,8 +91,8 @@
TARGET_LINK_LIBRARIES(vpdfl mbl vnl_algo vnl_io vnl vsl vul)
Index: vxl-1.14.0/v3p/Qv/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/v3p/Qv/CMakeLists.txt 2011-09-24 20:57:30.000000000 +0200
-+++ vxl-1.14.0/v3p/Qv/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/v3p/Qv/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/v3p/Qv/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -169,6 +169,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -103,8 +103,8 @@
Index: vxl-1.14.0/contrib/prip/vpyr/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/prip/vpyr/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/prip/vpyr/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/prip/vpyr/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/prip/vpyr/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -23,6 +23,7 @@
)
@@ -115,8 +115,8 @@
TARGET_LINK_LIBRARIES(vpyr vmap)
Index: vxl-1.14.0/core/vgl/algo/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vgl/algo/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/core/vgl/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vgl/algo/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vgl/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -41,6 +41,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_algo_sources)
@@ -127,8 +127,8 @@
INSTALL_TARGETS(/lib vgl_algo)
Index: vxl-1.14.0/contrib/brl/bmvl/bcal/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bmvl/bcal/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bmvl/bcal/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bmvl/bcal/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bmvl/bcal/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -21,6 +21,7 @@
)
@@ -139,8 +139,8 @@
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-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bgrl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bgrl/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bgrl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -19,6 +19,7 @@
AUX_SOURCE_DIRECTORY(Templates bgrl_sources)
@@ -151,8 +151,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/bgrl2/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bgrl2/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bgrl2/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bgrl2/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bgrl2/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -17,7 +17,9 @@
)
@@ -166,8 +166,8 @@
#Algorithms on graphs
Index: vxl-1.14.0/contrib/brl/bbas/bgrl2/algo/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bgrl2/algo/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bgrl2/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bgrl2/algo/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bgrl2/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -5,5 +5,8 @@
)
@@ -181,8 +181,8 @@
+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-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/vdgl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/vdgl/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vdgl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -23,6 +23,7 @@
AUX_SOURCE_DIRECTORY(Templates vdgl_sources)
@@ -193,8 +193,8 @@
TARGET_LINK_LIBRARIES(vdgl vsol vgl_algo vgl vnl_algo vnl vbl_io vbl vsl vul vcl)
Index: vxl-1.14.0/contrib/gel/vtol/algo/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/vtol/algo/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/vtol/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/vtol/algo/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vtol/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -8,6 +8,7 @@
AUX_SOURCE_DIRECTORY( Templates vtol_algo_sources )
@@ -205,8 +205,8 @@
TARGET_LINK_LIBRARIES( vtol_algo vtol vsol vdgl vil_algo vgl_algo vgl vil vbl )
Index: vxl-1.14.0/contrib/gel/vtol/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/vtol/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/vtol/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/vtol/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vtol/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -35,6 +35,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -217,8 +217,8 @@
TARGET_LINK_LIBRARIES(vtol vdgl vsol vnl vbl vul ${CMAKE_THREAD_LIBS})
Index: vxl-1.14.0/contrib/oxl/mvl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/oxl/mvl/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/mvl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/mvl/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/oxl/mvl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -113,6 +113,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -229,8 +229,8 @@
TARGET_LINK_LIBRARIES(mvl vil1 vnl_algo vnl vbl vgl vgl_algo vul)
Index: vxl-1.14.0/contrib/prip/vdtop/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/prip/vdtop/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/prip/vdtop/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/prip/vdtop/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/prip/vdtop/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -26,6 +26,7 @@
)
@@ -241,8 +241,8 @@
TARGET_LINK_LIBRARIES(vdtop vmap vil)
Index: vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt 2011-09-24 21:04:36.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/b3p/minizip/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -23,6 +23,8 @@
ENDIF(WIN32)
@@ -254,8 +254,8 @@
ENDIF(ZLIB_FOUND)
Index: vxl-1.14.0/contrib/brl/bmvl/bmvv/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bmvl/bmvv/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bmvl/bmvv/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bmvl/bmvv/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bmvl/bmvv/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -39,6 +39,7 @@
)
@@ -266,8 +266,8 @@
Index: vxl-1.14.0/contrib/tbl/vipl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/tbl/vipl/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/contrib/tbl/vipl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/tbl/vipl/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/tbl/vipl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -77,6 +77,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -278,8 +278,8 @@
TARGET_LINK_LIBRARIES(vipl vil vil1 vnl vbl)
Index: vxl-1.14.0/core/vul/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vul/CMakeLists.txt 2011-09-24 20:57:29.000000000 +0200
-+++ vxl-1.14.0/core/vul/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vul/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vul/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -76,6 +76,7 @@
ENDIF(APPLE)
@@ -290,8 +290,8 @@
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vul
Index: vxl-1.14.0/contrib/brl/b3p/shapelib/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/b3p/shapelib/CMakeLists.txt 2011-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/b3p/shapelib/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/b3p/shapelib/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/b3p/shapelib/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -22,6 +22,7 @@
)
@@ -302,8 +302,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/bdgl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bdgl/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bdgl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bdgl/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bdgl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -20,6 +20,7 @@
)
@@ -314,8 +314,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/bdpg/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bdpg/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bdpg/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bdpg/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bdpg/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -10,6 +10,7 @@
AUX_SOURCE_DIRECTORY(Templates bdpg_sources)
@@ -326,8 +326,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/bgui/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bgui/CMakeLists.txt 2011-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bgui/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bgui/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bgui/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -39,6 +39,7 @@
AUX_SOURCE_DIRECTORY(Templates bgui_sources)
@@ -338,8 +338,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/bgui3d/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bgui3d/CMakeLists.txt 2011-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bgui3d/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bgui3d/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bgui3d/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -60,6 +60,7 @@
)
@@ -350,8 +350,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/bil/algo/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bil/algo/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bil/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bil/algo/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bil/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -27,6 +27,9 @@
AUX_SOURCE_DIRECTORY(Templates bil_algo_sources)
@@ -364,8 +364,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/bil/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bil/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bil/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bil/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bil/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -10,6 +10,9 @@
AUX_SOURCE_DIRECTORY(Templates bil_sources)
@@ -378,8 +378,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -13,4 +13,7 @@
)
@@ -390,8 +390,8 @@
TARGET_LINK_LIBRARIES( bmsh3d_algo bmsh3d rply vgl vnl vul)
Index: vxl-1.14.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -5,6 +5,7 @@
)
@@ -402,8 +402,8 @@
TARGET_LINK_LIBRARIES( bnl_algo vnl )
Index: vxl-1.14.0/contrib/brl/bbas/bnl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bnl/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bnl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bnl/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bnl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -8,6 +8,7 @@
)
@@ -414,8 +414,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/bsol/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bsol/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bsol/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bsol/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bsol/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -24,6 +24,7 @@
AUX_SOURCE_DIRECTORY(Templates bsol_sources)
@@ -426,8 +426,8 @@
TARGET_LINK_LIBRARIES(bsol vsol vgl_algo vgl vnl vbl)
Index: vxl-1.14.0/contrib/brl/bbas/bsta/algo/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bsta/algo/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bsta/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bsta/algo/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bsta/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -20,6 +20,9 @@
AUX_SOURCE_DIRECTORY(Templates bsta_algo_sources)
@@ -440,8 +440,8 @@
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-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bsta/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bsta/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bsta/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -53,6 +53,7 @@
AUX_SOURCE_DIRECTORY(Templates bsta_sources)
@@ -452,8 +452,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -8,6 +8,9 @@
)
@@ -466,8 +466,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/btol/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/btol/CMakeLists.txt 2011-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/btol/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/btol/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/btol/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -19,6 +19,7 @@
)
@@ -478,8 +478,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/bugl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bugl/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bugl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bugl/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bugl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -26,6 +26,7 @@
AUX_SOURCE_DIRECTORY(Templates bugl_sources)
@@ -490,8 +490,8 @@
TARGET_LINK_LIBRARIES(bugl vnl vgl_algo vgl vbl)
Index: vxl-1.14.0/contrib/brl/bbas/bvgl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bvgl/CMakeLists.txt 2011-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bvgl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bvgl/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bvgl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -20,6 +20,7 @@
AUX_SOURCE_DIRECTORY(Templates bvgl_sources)
@@ -502,8 +502,8 @@
TARGET_LINK_LIBRARIES(bvgl vsol vgl_algo vgl vnl vil vbl)
Index: vxl-1.14.0/contrib/brl/bbas/bvrml/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bvrml/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bvrml/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bvrml/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bvrml/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -6,5 +6,8 @@
)
@@ -517,8 +517,8 @@
+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-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -31,5 +31,8 @@
ENDIF(ECW_FOUND)
@@ -530,8 +530,8 @@
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.14.0/contrib/brl/bbas/bxml/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/bxml/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/bxml/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/bxml/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bxml/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -22,6 +22,9 @@
AUX_SOURCE_DIRECTORY(Templates bxml_sources)
@@ -544,8 +544,8 @@
Index: vxl-1.14.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2011-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -17,5 +17,8 @@
AUX_SOURCE_DIRECTORY(Templates imesh_algo_sources)
@@ -557,8 +557,8 @@
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-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bmvl/brct/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bmvl/brct/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bmvl/brct/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -39,6 +39,7 @@
ENDIF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
@@ -569,8 +569,8 @@
Index: vxl-1.14.0/contrib/brl/bmvl/btom/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bmvl/btom/CMakeLists.txt 2011-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bmvl/btom/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bmvl/btom/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bmvl/btom/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -18,6 +18,7 @@
AUX_SOURCE_DIRECTORY(Templates btom_sources)
@@ -581,8 +581,8 @@
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-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bpro/core/brip_pro/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bpro/core/brip_pro/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/core/brip_pro/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -14,4 +14,7 @@
AUX_SOURCE_DIRECTORY(processes brip_pro_sources)
@@ -593,8 +593,8 @@
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-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -14,6 +14,9 @@
AUX_SOURCE_DIRECTORY(processes bvgl_pro_sources)
@@ -607,8 +607,8 @@
Index: vxl-1.14.0/contrib/brl/bpro/core/sdet_pro/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bpro/core/sdet_pro/CMakeLists.txt 2011-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bpro/core/sdet_pro/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bpro/core/sdet_pro/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/core/sdet_pro/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -16,4 +16,7 @@
AUX_SOURCE_DIRECTORY(processes sdet_pro_sources)
@@ -619,8 +619,8 @@
+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-09-24 20:57:23.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bpro/core/vidl_pro/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bpro/core/vidl_pro/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/core/vidl_pro/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -24,4 +24,7 @@
AUX_SOURCE_DIRECTORY(processes vidl_pro_sources)
@@ -631,8 +631,8 @@
+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-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -17,6 +17,9 @@
AUX_SOURCE_DIRECTORY(processes vil_pro_sources)
@@ -645,8 +645,8 @@
Index: vxl-1.14.0/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt 2011-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -17,6 +17,9 @@
AUX_SOURCE_DIRECTORY(processes vpgl_pro_sources)
@@ -659,8 +659,8 @@
Index: vxl-1.14.0/contrib/brl/bseg/bmdl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bseg/bmdl/CMakeLists.txt 2011-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bmdl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bmdl/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bmdl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -16,6 +16,9 @@
AUX_SOURCE_DIRECTORY(Templates bmdl_sources)
@@ -673,8 +673,8 @@
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 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-09-24 21:04:36.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -31,6 +31,9 @@
AUX_SOURCE_DIRECTORY(processes bmdl_pro_sources)
@@ -687,8 +687,8 @@
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.14.0.orig/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2011-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -10,6 +10,9 @@
)
@@ -701,8 +701,8 @@
SUBDIRS(tests)
Index: vxl-1.14.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2011-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -16,6 +16,9 @@
AUX_SOURCE_DIRECTORY(processes boxm_algo_pro_sources)
@@ -715,8 +715,8 @@
ENDIF(EXPAT_FOUND)
Index: vxl-1.14.0/contrib/brl/bseg/boxm/opt/open_cl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bseg/boxm/opt/open_cl/CMakeLists.txt 2011-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/boxm/opt/open_cl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/boxm/opt/open_cl/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/boxm/opt/open_cl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -19,6 +19,9 @@
)
AUX_SOURCE_DIRECTORY(Templates boxm_opt_opencl_sources)
@@ -729,8 +729,8 @@
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-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/brec_batch/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/brec_batch/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/brec_batch/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -43,4 +43,4 @@
INCLUDE( ${MODULE_PATH}/NewCMake/FindDirectShow.cmake )
IF(DIRECTSHOW_FOUND)
@@ -740,8 +740,8 @@
+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-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/brip/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/brip/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/brip/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -34,6 +34,7 @@
AUX_SOURCE_DIRECTORY(Templates brip_sources)
@@ -752,8 +752,8 @@
Index: vxl-1.14.0/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt 2011-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -25,6 +25,9 @@
AUX_SOURCE_DIRECTORY(Templates bvpl_octree_sources)
@@ -766,8 +766,8 @@
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-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -16,6 +16,9 @@
AUX_SOURCE_DIRECTORY(processes bvpl_octree_pro_sources)
@@ -780,8 +780,8 @@
Index: vxl-1.14.0/contrib/brl/bseg/bvpl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/CMakeLists.txt 2011-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bvpl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -37,6 +37,9 @@
AUX_SOURCE_DIRECTORY(Templates bvpl_sources)
@@ -794,8 +794,8 @@
Index: vxl-1.14.0/contrib/brl/bseg/bvpl/io/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/io/CMakeLists.txt 2011-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bvpl/io/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/io/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/io/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -8,5 +8,8 @@
ADD_LIBRARY(bvpl_io ${bvpl_io_sources})
@@ -807,8 +807,8 @@
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-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bvpl/pro/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/pro/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/pro/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -18,6 +18,9 @@
AUX_SOURCE_DIRECTORY(processes/util bvpl_pro_sources)
@@ -821,8 +821,8 @@
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-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bvpl/util/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/util/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/util/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -11,6 +11,9 @@
AUX_SOURCE_DIRECTORY(Templates bvpl_util_sources)
@@ -835,8 +835,8 @@
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-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bvpl/util/io/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvpl/util/io/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvpl/util/io/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -8,5 +8,7 @@
ADD_LIBRARY(bvpl_util_io ${bvpl_util_io_sources})
@@ -848,8 +848,8 @@
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-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -11,6 +11,9 @@
AUX_SOURCE_DIRECTORY(Templates bvxm_algo_sources)
@@ -862,8 +862,8 @@
Index: vxl-1.14.0/contrib/brl/bseg/sdet/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bseg/sdet/CMakeLists.txt 2011-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/sdet/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/sdet/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/sdet/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -38,6 +38,7 @@
AUX_SOURCE_DIRECTORY(Templates sdet_sources)
@@ -874,8 +874,8 @@
Index: vxl-1.14.0/contrib/brl/bseg/segv/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bseg/segv/CMakeLists.txt 2011-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/segv/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/segv/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/segv/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -36,6 +36,7 @@
)
@@ -886,8 +886,8 @@
Index: vxl-1.14.0/contrib/brl/bseg/strk/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bseg/strk/CMakeLists.txt 2011-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/strk/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/strk/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/strk/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -39,6 +39,7 @@
ENDIF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
@@ -898,8 +898,8 @@
Index: vxl-1.14.0/contrib/brl/bseg/vpro/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/bseg/vpro/CMakeLists.txt 2011-09-24 20:57:22.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/bseg/vpro/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/bseg/vpro/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/vpro/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -45,6 +45,7 @@
ENDIF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD)
@@ -910,8 +910,8 @@
Index: vxl-1.14.0/contrib/brl/vvid/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/brl/vvid/CMakeLists.txt 2011-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/brl/vvid/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/brl/vvid/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/vvid/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -49,6 +49,7 @@
ELSE(HAS_CMU1394CAMERA)
ADD_LIBRARY(vvid ${vvid_sources})
@@ -922,8 +922,8 @@
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-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/geml/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/geml/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/geml/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -12,6 +12,7 @@
)
@@ -934,8 +934,8 @@
TARGET_LINK_LIBRARIES(geml vil1 vnl)
Index: vxl-1.14.0/contrib/gel/gevd/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/gevd/CMakeLists.txt 2011-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/gevd/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/gevd/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/gevd/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -33,6 +33,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -946,8 +946,8 @@
TARGET_LINK_LIBRARIES(gevd vtol vsol vdgl vil1 vil vnl vgl vbl vul)
Index: vxl-1.14.0/contrib/gel/gkll/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/gkll/CMakeLists.txt 2011-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/gkll/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/gkll/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/gkll/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -20,6 +20,7 @@
ENDIF(BUILD_OXL)
@@ -958,8 +958,8 @@
Index: vxl-1.14.0/contrib/gel/gmvl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/gmvl/CMakeLists.txt 2011-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/gmvl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/gmvl/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/gmvl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -21,6 +21,7 @@
AUX_SOURCE_DIRECTORY(Templates gmvl_sources)
@@ -970,8 +970,8 @@
TARGET_LINK_LIBRARIES(gmvl vtol vil1 vnl vbl vcl)
Index: vxl-1.14.0/contrib/gel/gst/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/gst/CMakeLists.txt 2011-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt 2011-09-24 21:04:37.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/gst/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/gst/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -17,6 +17,7 @@
AUX_SOURCE_DIRECTORY(Templates gst_sources)
@@ -982,8 +982,8 @@
Index: vxl-1.14.0/contrib/gel/gtrl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/gtrl/CMakeLists.txt 2011-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/gtrl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/gtrl/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/gtrl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -25,6 +25,7 @@
ENDIF(NETLIB_FOUND)
@@ -994,8 +994,8 @@
Index: vxl-1.14.0/contrib/gel/mrc/vpgl/algo/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/algo/CMakeLists.txt 2011-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/mrc/vpgl/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/algo/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -39,6 +39,9 @@
ADD_LIBRARY(vpgl_algo ${vpgl_algo_sources})
@@ -1008,8 +1008,8 @@
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-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/mrc/vpgl/bgeo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/bgeo/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/bgeo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -12,6 +12,7 @@
AUX_SOURCE_DIRECTORY(Templates bgeo_sources)
@@ -1020,8 +1020,8 @@
Index: vxl-1.14.0/contrib/gel/mrc/vpgl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/CMakeLists.txt 2011-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/mrc/vpgl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -30,6 +30,9 @@
AUX_SOURCE_DIRECTORY(Templates vpgl_sources)
@@ -1034,8 +1034,8 @@
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-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/mrc/vpgl/file_formats/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/file_formats/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/file_formats/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -23,5 +23,8 @@
ENDIF(TIFF_FOUND)
@@ -1047,8 +1047,8 @@
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-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/mrc/vpgl/io/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/io/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/io/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -12,3 +12,6 @@
ADD_LIBRARY(vpgl_io ${vpgl_io_sources})
@@ -1058,8 +1058,8 @@
+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-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/mrc/vpgl/xio/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/xio/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/mrc/vpgl/xio/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -7,6 +7,7 @@
AUX_SOURCE_DIRECTORY(Templates vpgl_xio_sources)
@@ -1070,8 +1070,8 @@
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-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/vgel/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/vgel/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vgel/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -20,6 +20,7 @@
ENDIF(BUILD_OXL)
@@ -1082,8 +1082,8 @@
Index: vxl-1.14.0/contrib/gel/vgel/kl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/vgel/kl/CMakeLists.txt 2011-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/vgel/kl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/vgel/kl/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vgel/kl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -15,6 +15,7 @@
)
@@ -1094,8 +1094,8 @@
Index: vxl-1.14.0/contrib/gel/vifa/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/vifa/CMakeLists.txt 2011-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/vifa/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/vifa/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vifa/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -31,6 +31,7 @@
AUX_SOURCE_DIRECTORY(Templates vifa_sources)
@@ -1106,8 +1106,8 @@
TARGET_LINK_LIBRARIES(vifa gevd vtol vsol vdgl vnl vgl vbl vul vil vcl)
Index: vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/vmal/CMakeLists.txt 2011-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt 2011-09-24 21:04:37.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/vmal/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vmal/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -35,6 +35,7 @@
ENDIF(BUILD_OXL)
@@ -1118,8 +1118,8 @@
Index: vxl-1.14.0/contrib/gel/vsol/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/vsol/CMakeLists.txt 2011-09-24 20:57:24.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/vsol/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/vsol/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vsol/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -63,6 +63,7 @@
AUX_SOURCE_DIRECTORY(Templates vsol_sources)
@@ -1130,8 +1130,8 @@
TARGET_LINK_LIBRARIES(vsol vgl_algo vgl_io vgl vnl vbl_io vbl vsl vul vcl)
Index: vxl-1.14.0/contrib/gel/vsrl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/gel/vsrl/CMakeLists.txt 2011-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/gel/vsrl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/gel/vsrl/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/gel/vsrl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -60,6 +60,7 @@
ENDIF (HAS_VGUI)
@@ -1142,8 +1142,8 @@
Index: vxl-1.14.0/contrib/mul/ipts/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/ipts/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/ipts/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/ipts/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/ipts/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -16,6 +16,7 @@
)
@@ -1154,8 +1154,8 @@
TARGET_LINK_LIBRARIES(ipts vimt_algo vimt vgl vil_algo vil)
Index: vxl-1.14.0/contrib/mul/mbl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/mbl/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/mbl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/mbl/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/mbl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -118,6 +118,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1166,8 +1166,8 @@
INSTALL_TARGETS(/lib mbl)
Index: vxl-1.14.0/contrib/mul/mcal/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/mcal/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/mcal/CMakeLists.txt 2011-09-24 21:04:37.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/mcal/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/mcal/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -19,6 +19,9 @@
AUX_SOURCE_DIRECTORY(Templates mcal_sources)
@@ -1180,8 +1180,8 @@
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-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/mil/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/mil/algo/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/mil/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -15,6 +15,7 @@
AUX_SOURCE_DIRECTORY(Templates mil_algo_sources)
@@ -1192,8 +1192,8 @@
TARGET_LINK_LIBRARIES(mil_algo mil mbl vnl vsl)
Index: vxl-1.14.0/contrib/mul/mil/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/mil/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/mil/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/mil/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/mil/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -37,6 +37,7 @@
AUX_SOURCE_DIRECTORY(Templates mil_sources)
@@ -1204,8 +1204,8 @@
TARGET_LINK_LIBRARIES(mil mbl vimt vnl vbl_io vgl vil1 vbl vsl)
Index: vxl-1.14.0/contrib/mul/mil3d/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/mil3d/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/mil3d/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/mil3d/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/mil3d/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -20,6 +20,7 @@
AUX_SOURCE_DIRECTORY(Templates mil3d_sources)
@@ -1216,8 +1216,8 @@
TARGET_LINK_LIBRARIES(mil3d mil vbl_io vnl_io vnl vgl vbl vsl)
Index: vxl-1.14.0/contrib/mul/mvl2/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/mvl2/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/mvl2/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/mvl2/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/mvl2/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -53,6 +53,7 @@
@@ -1228,8 +1228,8 @@
TARGET_LINK_LIBRARIES( mvl2 vil vul ${AVIFILE_LIBRARIES} )
Index: vxl-1.14.0/contrib/mul/pdf1d/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/pdf1d/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/pdf1d/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/pdf1d/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/pdf1d/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -49,6 +49,7 @@
AUX_SOURCE_DIRECTORY(Templates pdf1d_sources)
@@ -1240,8 +1240,8 @@
TARGET_LINK_LIBRARIES( pdf1d mbl vbl vnl_io vnl vsl )
Index: vxl-1.14.0/contrib/mul/vil3d/algo/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/vil3d/algo/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/vil3d/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/vil3d/algo/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vil3d/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -36,6 +36,7 @@
AUX_SOURCE_DIRECTORY(Templates vil3d_algo_sources)
@@ -1252,8 +1252,8 @@
TARGET_LINK_LIBRARIES( vil3d_algo vil3d vil_algo vil vnl vgl )
Index: vxl-1.14.0/contrib/mul/vil3d/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/vil3d/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/vil3d/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/vil3d/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vil3d/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -48,6 +48,7 @@
AUX_SOURCE_DIRECTORY(Templates vil3d_sources)
@@ -1264,8 +1264,8 @@
INSTALL_TARGETS(/lib vil3d)
Index: vxl-1.14.0/contrib/mul/vil3d/io/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/vil3d/io/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/vil3d/io/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/vil3d/io/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vil3d/io/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -7,6 +7,7 @@
)
@@ -1276,8 +1276,8 @@
TARGET_LINK_LIBRARIES( vil3d_io vil3d vil_io )
Index: vxl-1.14.0/contrib/mul/vimt/algo/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/vimt/algo/CMakeLists.txt 2011-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/vimt/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/vimt/algo/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vimt/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -11,6 +11,7 @@
)
@@ -1288,8 +1288,8 @@
TARGET_LINK_LIBRARIES( vimt_algo vimt vil_algo vgl vcl )
Index: vxl-1.14.0/contrib/mul/vimt/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/vimt/CMakeLists.txt 2011-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/vimt/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/vimt/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vimt/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -35,6 +35,7 @@
AUX_SOURCE_DIRECTORY(Templates vimt_sources)
@@ -1300,8 +1300,8 @@
TARGET_LINK_LIBRARIES(vimt mbl vil_algo vgl vnl vil )
Index: vxl-1.14.0/contrib/mul/vimt3d/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/mul/vimt3d/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/contrib/mul/vimt3d/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/mul/vimt3d/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/mul/vimt3d/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -33,6 +33,7 @@
AUX_SOURCE_DIRECTORY(Templates vimt3d_sources)
@@ -1312,8 +1312,8 @@
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.14.0.orig/contrib/oul/ouel/CMakeLists.txt 2011-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/oul/ouel/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oul/ouel/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/oul/ouel/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -11,6 +11,7 @@
)
@@ -1324,8 +1324,8 @@
TARGET_LINK_LIBRARIES( ouel vnl_algo vnl )
Index: vxl-1.14.0/contrib/oul/oufgl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/oul/oufgl/CMakeLists.txt 2011-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/oul/oufgl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oul/oufgl/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/oul/oufgl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -15,6 +15,7 @@
)
@@ -1336,8 +1336,8 @@
TARGET_LINK_LIBRARIES( oufgl vil vil1 rt)
Index: vxl-1.14.0/contrib/oul/ouml/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/oul/ouml/CMakeLists.txt 2011-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/oul/ouml/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oul/ouml/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/oul/ouml/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -20,6 +20,7 @@
)
@@ -1348,8 +1348,8 @@
TARGET_LINK_LIBRARIES( ouml vgl vnl_algo vnl_io vnl vil1 vsl vpl )
Index: vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/oxl/osl/CMakeLists.txt 2011-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt 2011-09-24 21:04:36.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/osl/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/oxl/osl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -45,6 +45,7 @@
AUX_SOURCE_DIRECTORY(Templates osl_sources)
@@ -1360,8 +1360,8 @@
TARGET_LINK_LIBRARIES(osl vnl_algo vnl vgl vil1 vbl)
Index: vxl-1.14.0/contrib/oxl/vrml/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/oxl/vrml/CMakeLists.txt 2011-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/oxl/vrml/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/oxl/vrml/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/oxl/vrml/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -10,4 +10,8 @@
)
@@ -1373,8 +1373,8 @@
+
Index: vxl-1.14.0/contrib/prip/vmap/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/prip/vmap/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/contrib/prip/vmap/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/prip/vmap/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/prip/vmap/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -28,6 +28,7 @@
)
@@ -1385,8 +1385,8 @@
TARGET_LINK_LIBRARIES(vmap vcl)
Index: vxl-1.14.0/contrib/rpl/rgrl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/rpl/rgrl/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/contrib/rpl/rgrl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/rpl/rgrl/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/rpl/rgrl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -161,6 +161,7 @@
AUX_SOURCE_DIRECTORY( Templates rgrl_sources )
@@ -1397,8 +1397,8 @@
TARGET_LINK_LIBRARIES( rgrl rrel rsdl vil3d vil vnl_algo vnl vbl vul)
Index: vxl-1.14.0/contrib/rpl/rgtl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/rpl/rgtl/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/contrib/rpl/rgtl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/rpl/rgtl/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/rpl/rgtl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -84,6 +84,7 @@
)
@@ -1409,8 +1409,8 @@
INSTALL_TARGETS(/lib rgtl)
Index: vxl-1.14.0/contrib/rpl/rrel/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/rpl/rrel/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/contrib/rpl/rrel/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/rpl/rrel/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/rpl/rrel/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -44,6 +44,7 @@
AUX_SOURCE_DIRECTORY(Templates rrel_sources)
@@ -1421,8 +1421,8 @@
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-09-24 20:57:21.000000000 +0200
-+++ vxl-1.14.0/contrib/rpl/rtvl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/rpl/rtvl/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/rpl/rtvl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -41,6 +41,7 @@
)
@@ -1433,8 +1433,8 @@
INSTALL_TARGETS(/lib rtvl)
Index: vxl-1.14.0/contrib/tbl/vepl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/tbl/vepl/CMakeLists.txt 2011-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/tbl/vepl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/tbl/vepl/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/tbl/vepl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -45,6 +45,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1445,8 +1445,8 @@
TARGET_LINK_LIBRARIES(vepl vipl vil1 ${CMAKE_THREAD_LIBS})
Index: vxl-1.14.0/contrib/tbl/vepl2/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/contrib/tbl/vepl2/CMakeLists.txt 2011-09-24 20:57:25.000000000 +0200
-+++ vxl-1.14.0/contrib/tbl/vepl2/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/contrib/tbl/vepl2/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/contrib/tbl/vepl2/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -52,6 +52,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1457,8 +1457,8 @@
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-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/testlib/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/testlib/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/testlib/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -29,6 +29,7 @@
)
@@ -1469,8 +1469,8 @@
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/testlib ${testlib_sources})
Index: vxl-1.14.0/core/vbl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vbl/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vbl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vbl/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vbl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -38,6 +38,7 @@
AUX_SOURCE_DIRECTORY(Templates vbl_sources)
@@ -1481,8 +1481,8 @@
INSTALL_TARGETS(/lib vbl)
Index: vxl-1.14.0/core/vbl/io/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vbl/io/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vbl/io/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vbl/io/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vbl/io/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -17,6 +17,7 @@
AUX_SOURCE_DIRECTORY(Templates vbl_io_sources)
@@ -1493,8 +1493,8 @@
INSTALL_TARGETS(/lib vbl_io)
Index: vxl-1.14.0/core/vcsl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vcsl/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vcsl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vcsl/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vcsl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -63,6 +63,7 @@
AUX_SOURCE_DIRECTORY( Templates vcsl_sources )
@@ -1505,8 +1505,8 @@
INSTALL_TARGETS(/lib vcsl)
Index: vxl-1.14.0/core/vgl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vgl/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vgl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vgl/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vgl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -68,6 +68,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_sources)
@@ -1517,8 +1517,8 @@
#DEPENDS core/vsl core/vnl
Index: vxl-1.14.0/core/vgl/io/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vgl/io/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vgl/io/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vgl/io/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vgl/io/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -28,6 +28,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_io_sources)
@@ -1529,8 +1529,8 @@
INSTALL_TARGETS(/lib vgl_io)
Index: vxl-1.14.0/core/vgl/xio/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vgl/xio/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vgl/xio/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vgl/xio/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vgl/xio/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -10,6 +10,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_xio_sources)
@@ -1541,8 +1541,8 @@
INSTALL_TARGETS(/lib vgl_xio)
Index: vxl-1.14.0/core/vgui/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vgui/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vgui/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vgui/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vgui/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -488,6 +488,7 @@
)
@@ -1553,8 +1553,8 @@
SET( VGUI_FOUND "YES" CACHE INTERNAL "Was vgui successfully built?" )
Index: vxl-1.14.0/core/vgui/wx/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vgui/wx/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vgui/wx/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vgui/wx/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vgui/wx/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -24,6 +24,7 @@
)
@@ -1565,8 +1565,8 @@
ENDIF(wxWidgets_FOUND)
Index: vxl-1.14.0/core/vidl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vidl/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/core/vidl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vidl/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vidl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -127,6 +127,7 @@
AUX_SOURCE_DIRECTORY(Templates vidl_sources)
@@ -1577,8 +1577,8 @@
Index: vxl-1.14.0/core/vidl/gui/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vidl/gui/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/core/vidl/gui/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vidl/gui/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vidl/gui/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -12,6 +12,7 @@
)
@@ -1589,8 +1589,8 @@
TARGET_LINK_LIBRARIES( vidl_gui vidl vgui vil )
Index: vxl-1.14.0/core/vidl1/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vidl1/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/core/vidl1/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vidl1/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vidl1/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -89,6 +89,7 @@
@@ -1601,8 +1601,8 @@
Index: vxl-1.14.0/core/vidl_vil1/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vidl_vil1/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vidl_vil1/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vidl_vil1/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vidl_vil1/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -40,6 +40,7 @@
ENDIF( WIN32 )
@@ -1613,8 +1613,8 @@
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-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/core/vil/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vil/algo/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vil/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -59,6 +59,7 @@
AUX_SOURCE_DIRECTORY(Templates vil_algo_sources)
@@ -1625,8 +1625,8 @@
Index: vxl-1.14.0/core/vil/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vil/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/core/vil/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vil/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vil/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -311,6 +311,7 @@
TARGET_LINK_LIBRARIES( vil nsl vil_network socket )
ENDIF (SOLARIS)
@@ -1637,8 +1637,8 @@
${vil_network_sources}
Index: vxl-1.14.0/core/vil/io/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vil/io/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/core/vil/io/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vil/io/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vil/io/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -14,6 +14,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1649,8 +1649,8 @@
INSTALL_TARGETS(/lib vil_io)
Index: vxl-1.14.0/core/vil1/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vil1/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/core/vil1/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vil1/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vil1/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -169,6 +169,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1661,8 +1661,8 @@
Index: vxl-1.14.0/core/vil1/io/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vil1/io/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/core/vil1/io/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vil1/io/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vil1/io/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -15,6 +15,7 @@
AUX_SOURCE_DIRECTORY(Templates vil1_io_sources)
@@ -1673,8 +1673,8 @@
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1/io ${vil1_io_sources})
Index: vxl-1.14.0/core/vnl/algo/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vnl/algo/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/core/vnl/algo/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vnl/algo/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vnl/algo/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -100,6 +100,7 @@
AUX_SOURCE_DIRECTORY(Templates vnl_algo_sources)
@@ -1685,8 +1685,8 @@
INSTALL_TARGETS(/lib vnl_algo)
Index: vxl-1.14.0/core/vnl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vnl/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/core/vnl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vnl/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vnl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -257,6 +257,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1697,8 +1697,8 @@
INSTALL_TARGETS(/lib vnl)
Index: vxl-1.14.0/core/vnl/io/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vnl/io/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/core/vnl/io/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vnl/io/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vnl/io/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -26,6 +26,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1709,8 +1709,8 @@
INSTALL_TARGETS(/lib vnl_io)
Index: vxl-1.14.0/core/vnl/xio/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vnl/xio/CMakeLists.txt 2011-09-24 20:57:20.000000000 +0200
-+++ vxl-1.14.0/core/vnl/xio/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vnl/xio/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/core/vnl/xio/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -10,6 +10,7 @@
AUX_SOURCE_DIRECTORY(Templates vnl_xio_sources)
@@ -1721,8 +1721,8 @@
INSTALL_TARGETS(/lib vnl_xio)
Index: vxl-1.14.0/core/vpdl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vpdl/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vpdl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vpdl/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vpdl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -48,6 +48,7 @@
AUX_SOURCE_DIRECTORY(Templates vpdl_sources)
@@ -1733,8 +1733,8 @@
INSTALL_TARGETS(/lib vpdl)
Index: vxl-1.14.0/core/vpl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vpl/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vpl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vpl/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vpl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -13,6 +13,7 @@
)
@@ -1745,8 +1745,8 @@
INSTALL_TARGETS(/lib vpl)
Index: vxl-1.14.0/core/vsl/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vsl/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vsl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vsl/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vsl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -35,6 +35,7 @@
AUX_SOURCE_DIRECTORY(Templates vsl_sources)
@@ -1757,8 +1757,8 @@
INSTALL_TARGETS(/lib vsl)
Index: vxl-1.14.0/core/vul/io/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/core/vul/io/CMakeLists.txt 2011-09-24 20:57:19.000000000 +0200
-+++ vxl-1.14.0/core/vul/io/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/core/vul/io/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/core/vul/io/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -5,6 +5,7 @@
)
@@ -1769,8 +1769,8 @@
INSTALL_TARGETS(/lib vul_io)
Index: vxl-1.14.0/v3p/dcmtk/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/v3p/dcmtk/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/v3p/dcmtk/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/v3p/dcmtk/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/v3p/dcmtk/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -455,6 +455,7 @@
TARGET_LINK_LIBRARIES( dcmtk ${ZLIB_LIBRARIES} )
ENDIF( DCMTK_HAVE_ZLIB )
@@ -1781,8 +1781,8 @@
ENDIF( VXL_BUILD_DCMTK )
Index: vxl-1.14.0/v3p/rply/CMakeLists.txt
===================================================================
---- vxl-1.14.0.orig/v3p/rply/CMakeLists.txt 2011-09-24 20:57:26.000000000 +0200
-+++ vxl-1.14.0/v3p/rply/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/v3p/rply/CMakeLists.txt 2011-12-20 13:37:09.000000000 +0100
++++ vxl-1.14.0/v3p/rply/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -7,3 +7,6 @@
)
@@ -1792,8 +1792,8 @@
+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-09-24 20:57:18.000000000 +0200
-+++ vxl-1.14.0/vcl/CMakeLists.txt 2011-09-24 21:04:25.000000000 +0200
+--- vxl-1.14.0.orig/vcl/CMakeLists.txt 2011-12-20 13:37:06.000000000 +0100
++++ vxl-1.14.0/vcl/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
@@ -355,6 +355,7 @@
#AUX_SOURCE_DIRECTORY(Templates vcl_sources)
@@ -1802,3 +1802,137 @@
# CMake can automatically figure out the compiler characteristics on
# Windows too. No need to do manual config.
+Index: vxl-1.14.0/contrib/brl/b3p/expatpp/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/b3p/expatpp/CMakeLists.txt 2011-12-20 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/b3p/expatpp/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
+@@ -12,6 +12,9 @@
+ SET( expatpp_sources expatpp.h expatpp.cpp expatpplib.h )
+
+ ADD_LIBRARY( expatpp ${expatpp_sources} )
++ SET_TARGET_PROPERTIES( expatpp PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++ INSTALL_TARGETS(/lib expatpp)
++ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/expatpp ${expatpp_sources})
+ TARGET_LINK_LIBRARIES( expatpp ${EXPAT_LIBRARIES} )
+
+ ENDIF( EXPAT_FOUND )
+Index: vxl-1.14.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
+@@ -12,7 +12,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bsvg_sources)
+
+ ADD_LIBRARY(bsvg ${bsvg_sources})
+-
++SET_TARGET_PROPERTIES( bsvg PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bsvg)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bsvg ${bsvg_sources})
+ TARGET_LINK_LIBRARIES( bsvg bxml )
+
+ IF( BUILD_TESTING )
+Index: vxl-1.14.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
+@@ -32,7 +32,9 @@
+ )
+
+ ADD_LIBRARY( bmsh3d ${bmsh3d_sources})
+-
++SET_TARGET_PROPERTIES( bmsh3d PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bmsh3d)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bmsh3d ${bmsh3d_sources})
+ TARGET_LINK_LIBRARIES( bmsh3d vgl vgl_algo vnl vul)
+
+ SUBDIRS( algo )
+Index: vxl-1.14.0/contrib/brl/bpro/bprb/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bpro/bprb/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bpro/bprb/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
+@@ -18,7 +18,9 @@
+ AUX_SOURCE_DIRECTORY(Templates bprb_sources)
+
+ ADD_LIBRARY(bprb ${bprb_sources})
+-
++SET_TARGET_PROPERTIES( bprb PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bprb)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/bprb ${bprb_sources})
+ TARGET_LINK_LIBRARIES(bprb brdb bxml vbl vsl)
+
+ IF(BUILD_TESTING)
+Index: vxl-1.14.0/contrib/brl/bbas/brdb/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bbas/brdb/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/brdb/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
+@@ -17,7 +17,9 @@
+ AUX_SOURCE_DIRECTORY(Templates brdb_sources)
+
+ ADD_LIBRARY(brdb ${brdb_sources})
+-
++SET_TARGET_PROPERTIES( brdb PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++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 vsl)
+
+Index: vxl-1.14.0/contrib/brl/bbas/imesh/CMakeLists.txt
+===================================================================
+--- vxl-1.14.0.orig/contrib/brl/bbas/imesh/CMakeLists.txt 2011-12-20 13:37:08.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bbas/imesh/CMakeLists.txt 2011-12-20 13:37:16.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 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/bvxm/grid/CMakeLists.txt 2011-12-20 13:37:16.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 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/boxm/CMakeLists.txt 2011-12-20 13:37:16.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 13:37:07.000000000 +0100
++++ vxl-1.14.0/contrib/brl/bseg/boct/CMakeLists.txt 2011-12-20 13:37:16.000000000 +0100
+@@ -11,7 +11,9 @@
+ AUX_SOURCE_DIRECTORY(Templates boct_sources)
+
+ ADD_LIBRARY(boct ${boct_sources})
+-
++SET_TARGET_PROPERTIES( boct PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib boct)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boct ${boct_sources})
+ TARGET_LINK_LIBRARIES(boct vcl vgl vgl_io vnl_io vbl vnl)
+
+ #tests
More information about the debian-med-commit
mailing list