[med-svn] r12713 - trunk/packages/vxl/trunk/debian/patches
Mathieu Malaterre
malat at alioth.debian.org
Fri Dec 28 21:38:39 UTC 2012
Author: malat
Date: 2012-12-28 21:38:38 +0000 (Fri, 28 Dec 2012)
New Revision: 12713
Modified:
trunk/packages/vxl/trunk/debian/patches/vxl.soname.patch
Log:
Refresh patch
Modified: trunk/packages/vxl/trunk/debian/patches/vxl.soname.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/vxl.soname.patch 2012-12-28 18:06:53 UTC (rev 12712)
+++ trunk/packages/vxl/trunk/debian/patches/vxl.soname.patch 2012-12-28 21:38:38 UTC (rev 12713)
@@ -4,8 +4,8 @@
Index: vxl-1.17.0/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/CMakeLists.txt 2009-11-27 15:38:10.000000000 +0100
-+++ vxl-1.17.0/CMakeLists.txt 2012-07-28 21:02:13.299205971 +0200
+--- vxl-1.17.0.orig/CMakeLists.txt 2012-12-28 22:37:41.515500319 +0100
++++ vxl-1.17.0/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -12,6 +12,26 @@
PROJECT(vxl)
@@ -35,8 +35,8 @@
Index: vxl-1.17.0/v3p/netlib/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/v3p/netlib/CMakeLists.txt 2011-01-22 00:43:12.000000000 +0100
-+++ vxl-1.17.0/v3p/netlib/CMakeLists.txt 2012-07-28 21:02:13.299205971 +0200
+--- vxl-1.17.0.orig/v3p/netlib/CMakeLists.txt 2012-12-28 22:37:41.527500320 +0100
++++ vxl-1.17.0/v3p/netlib/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -8,6 +8,7 @@
)
@@ -55,8 +55,8 @@
IF(UNIX)
Index: vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/rpl/rsdl/CMakeLists.txt 2009-09-20 16:20:00.000000000 +0200
-+++ vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt 2012-07-28 21:02:13.299205971 +0200
+--- vxl-1.17.0.orig/contrib/rpl/rsdl/CMakeLists.txt 2012-12-28 22:37:41.791500326 +0100
++++ vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -21,6 +21,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -67,8 +67,8 @@
TARGET_LINK_LIBRARIES( rsdl vnl vbl )
Index: vxl-1.17.0/contrib/mul/clsfy/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/clsfy/CMakeLists.txt 2010-03-01 13:53:00.000000000 +0100
-+++ vxl-1.17.0/contrib/mul/clsfy/CMakeLists.txt 2012-07-28 21:02:13.299205971 +0200
+--- vxl-1.17.0.orig/contrib/mul/clsfy/CMakeLists.txt 2012-12-28 22:37:41.915500328 +0100
++++ vxl-1.17.0/contrib/mul/clsfy/CMakeLists.txt 2012-12-28 22:37:47.535500452 +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.17.0/contrib/mul/vpdfl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vpdfl/CMakeLists.txt 2009-12-26 16:50:13.000000000 +0100
-+++ vxl-1.17.0/contrib/mul/vpdfl/CMakeLists.txt 2012-07-28 21:02:13.299205971 +0200
+--- vxl-1.17.0.orig/contrib/mul/vpdfl/CMakeLists.txt 2012-12-28 22:37:41.839500327 +0100
++++ vxl-1.17.0/contrib/mul/vpdfl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +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.17.0/v3p/Qv/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/v3p/Qv/CMakeLists.txt 2005-10-11 14:49:51.000000000 +0200
-+++ vxl-1.17.0/v3p/Qv/CMakeLists.txt 2012-07-28 21:02:13.299205971 +0200
+--- vxl-1.17.0.orig/v3p/Qv/CMakeLists.txt 2012-12-28 22:37:41.535500320 +0100
++++ vxl-1.17.0/v3p/Qv/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -169,6 +169,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -103,8 +103,8 @@
Index: vxl-1.17.0/contrib/prip/vpyr/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/prip/vpyr/CMakeLists.txt 2006-10-17 15:03:35.000000000 +0200
-+++ vxl-1.17.0/contrib/prip/vpyr/CMakeLists.txt 2012-07-28 21:02:13.299205971 +0200
+--- vxl-1.17.0.orig/contrib/prip/vpyr/CMakeLists.txt 2012-12-28 22:37:41.827500325 +0100
++++ vxl-1.17.0/contrib/prip/vpyr/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -23,6 +23,7 @@
)
@@ -115,8 +115,8 @@
TARGET_LINK_LIBRARIES(vpyr vmap)
Index: vxl-1.17.0/core/vgl/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgl/algo/CMakeLists.txt 2011-03-15 16:57:23.000000000 +0100
-+++ vxl-1.17.0/core/vgl/algo/CMakeLists.txt 2012-07-28 21:02:13.299205971 +0200
+--- vxl-1.17.0.orig/core/vgl/algo/CMakeLists.txt 2012-12-28 22:37:42.059500331 +0100
++++ vxl-1.17.0/core/vgl/algo/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -44,6 +44,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_algo_sources)
@@ -127,8 +127,8 @@
INSTALL_TARGETS(/lib vgl_algo)
Index: vxl-1.17.0/contrib/brl/bbas/bgrl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bgrl/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bgrl/CMakeLists.txt 2012-07-28 21:02:13.303205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bgrl/CMakeLists.txt 2012-12-28 22:37:41.679500323 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bgrl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -19,6 +19,7 @@
AUX_SOURCE_DIRECTORY(Templates bgrl_sources)
@@ -139,8 +139,8 @@
Index: vxl-1.17.0/contrib/brl/bbas/bgrl2/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bgrl2/CMakeLists.txt 2009-12-26 16:50:56.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bbas/bgrl2/CMakeLists.txt 2012-07-28 21:02:13.303205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bgrl2/CMakeLists.txt 2012-12-28 22:37:41.639500322 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bgrl2/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -17,7 +17,9 @@
)
@@ -154,8 +154,8 @@
#Algorithms on graphs
Index: vxl-1.17.0/contrib/gel/vdgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vdgl/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/contrib/gel/vdgl/CMakeLists.txt 2012-07-28 21:02:13.303205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/vdgl/CMakeLists.txt 2012-12-28 22:37:41.975500330 +0100
++++ vxl-1.17.0/contrib/gel/vdgl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -23,6 +23,7 @@
AUX_SOURCE_DIRECTORY(Templates vdgl_sources)
@@ -166,8 +166,8 @@
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
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vtol/algo/CMakeLists.txt 2011-03-15 16:57:23.000000000 +0100
-+++ vxl-1.17.0/contrib/gel/vtol/algo/CMakeLists.txt 2012-07-28 21:02:13.303205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/vtol/algo/CMakeLists.txt 2012-12-28 22:37:41.955500329 +0100
++++ vxl-1.17.0/contrib/gel/vtol/algo/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -8,6 +8,7 @@
AUX_SOURCE_DIRECTORY( Templates vtol_algo_sources )
@@ -178,8 +178,8 @@
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
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vtol/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt 2012-07-28 21:02:13.303205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/vtol/CMakeLists.txt 2012-12-28 22:37:41.951500329 +0100
++++ vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -35,6 +35,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -190,8 +190,8 @@
TARGET_LINK_LIBRARIES(vtol vdgl vsol vnl vbl vul ${CMAKE_THREAD_LIBS})
Index: vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oxl/mvl/CMakeLists.txt 2009-09-20 21:44:15.000000000 +0200
-+++ vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt 2012-07-28 21:02:13.303205970 +0200
+--- vxl-1.17.0.orig/contrib/oxl/mvl/CMakeLists.txt 2012-12-28 22:37:41.539500320 +0100
++++ vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -113,6 +113,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -202,8 +202,8 @@
TARGET_LINK_LIBRARIES(mvl vil1 vnl_algo vnl vbl vgl vgl_algo vul)
Index: vxl-1.17.0/contrib/prip/vdtop/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/prip/vdtop/CMakeLists.txt 2006-10-17 15:03:35.000000000 +0200
-+++ vxl-1.17.0/contrib/prip/vdtop/CMakeLists.txt 2012-07-28 21:02:13.303205970 +0200
+--- vxl-1.17.0.orig/contrib/prip/vdtop/CMakeLists.txt 2012-12-28 22:37:41.815500326 +0100
++++ vxl-1.17.0/contrib/prip/vdtop/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -26,6 +26,7 @@
)
@@ -214,8 +214,8 @@
TARGET_LINK_LIBRARIES(vdtop vmap vil)
Index: vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2012-07-28 21:01:06.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt 2012-07-28 21:02:13.303205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2012-12-28 22:37:41.575500321 +0100
++++ vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -22,6 +22,8 @@
ENDIF(WIN32)
@@ -227,8 +227,8 @@
ENDIF(ZLIB_FOUND)
Index: vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/tbl/vipl/CMakeLists.txt 2009-12-26 16:50:56.000000000 +0100
-+++ vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt 2012-07-28 21:02:13.307205970 +0200
+--- vxl-1.17.0.orig/contrib/tbl/vipl/CMakeLists.txt 2012-12-28 22:37:41.811500326 +0100
++++ vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -77,6 +77,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -239,8 +239,8 @@
TARGET_LINK_LIBRARIES(vipl vil vil1 vnl vbl)
Index: vxl-1.17.0/core/vul/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vul/CMakeLists.txt 2010-01-25 22:16:13.000000000 +0100
-+++ vxl-1.17.0/core/vul/CMakeLists.txt 2012-07-28 21:02:13.307205970 +0200
+--- vxl-1.17.0.orig/core/vul/CMakeLists.txt 2012-12-28 22:37:42.107500333 +0100
++++ vxl-1.17.0/core/vul/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -76,6 +76,7 @@
ENDIF(APPLE)
@@ -251,8 +251,8 @@
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vul
Index: vxl-1.17.0/contrib/brl/bbas/bdgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bdgl/CMakeLists.txt 2009-12-10 21:00:35.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bbas/bdgl/CMakeLists.txt 2012-07-28 21:02:13.307205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bdgl/CMakeLists.txt 2012-12-28 22:37:41.711500324 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bdgl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -20,6 +20,7 @@
)
@@ -263,8 +263,8 @@
Index: vxl-1.17.0/contrib/brl/bbas/bdpg/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bdpg/CMakeLists.txt 2008-01-07 22:59:51.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bbas/bdpg/CMakeLists.txt 2012-07-28 21:02:13.307205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bdpg/CMakeLists.txt 2012-12-28 22:37:41.715500324 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bdpg/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -10,6 +10,7 @@
AUX_SOURCE_DIRECTORY(Templates bdpg_sources)
@@ -275,8 +275,8 @@
Index: vxl-1.17.0/contrib/brl/bbas/bgui/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bgui/CMakeLists.txt 2011-05-22 16:50:44.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bgui/CMakeLists.txt 2012-07-28 21:02:13.307205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bgui/CMakeLists.txt 2012-12-28 22:37:41.655500323 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bgui/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -38,6 +38,7 @@
AUX_SOURCE_DIRECTORY(Templates bgui_sources)
@@ -287,8 +287,8 @@
Index: vxl-1.17.0/contrib/brl/bbas/bgui3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bgui3d/CMakeLists.txt 2011-05-22 16:50:44.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bgui3d/CMakeLists.txt 2012-07-28 21:02:13.307205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bgui3d/CMakeLists.txt 2012-12-28 22:37:41.599500320 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bgui3d/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -60,6 +60,7 @@
)
@@ -299,8 +299,8 @@
Index: vxl-1.17.0/contrib/brl/bbas/bil/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bil/algo/CMakeLists.txt 2011-09-27 19:29:36.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bil/algo/CMakeLists.txt 2012-07-28 21:02:13.307205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bil/algo/CMakeLists.txt 2012-12-28 22:37:41.635500322 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bil/algo/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -31,6 +31,9 @@
AUX_SOURCE_DIRECTORY(Templates bil_algo_sources)
@@ -313,8 +313,8 @@
Index: vxl-1.17.0/contrib/brl/bbas/bil/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bil/CMakeLists.txt 2012-05-15 22:21:04.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bil/CMakeLists.txt 2012-07-28 21:02:13.307205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bil/CMakeLists.txt 2012-12-28 22:37:41.627500322 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bil/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -11,6 +11,9 @@
AUX_SOURCE_DIRECTORY(Templates bil_sources)
@@ -327,8 +327,8 @@
Index: vxl-1.17.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2011-09-27 19:29:36.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2012-07-28 21:02:13.307205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2012-12-28 22:37:41.691500322 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -13,6 +13,9 @@
)
@@ -341,8 +341,8 @@
IF( BUILD_TESTING )
Index: vxl-1.17.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2008-01-20 16:44:20.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2012-07-28 21:02:13.307205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2012-12-28 22:37:41.591500321 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -5,6 +5,7 @@
)
@@ -353,8 +353,8 @@
TARGET_LINK_LIBRARIES( bnl_algo vnl )
Index: vxl-1.17.0/contrib/brl/bbas/bnl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bnl/CMakeLists.txt 2008-01-07 22:59:51.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bbas/bnl/CMakeLists.txt 2012-07-28 21:02:13.307205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bnl/CMakeLists.txt 2012-12-28 22:37:41.587500321 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bnl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100
@@ -8,6 +8,7 @@
)
@@ -365,8 +365,8 @@
Index: vxl-1.17.0/contrib/brl/bbas/bsol/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bsol/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bsol/CMakeLists.txt 2012-07-28 21:02:13.311205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bsol/CMakeLists.txt 2012-12-28 22:37:41.603500321 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bsol/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -24,6 +24,7 @@
AUX_SOURCE_DIRECTORY(Templates bsol_sources)
@@ -377,8 +377,8 @@
TARGET_LINK_LIBRARIES(bsol vsol vgl_algo vgl vnl vbl)
Index: vxl-1.17.0/contrib/brl/bbas/bsta/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bsta/CMakeLists.txt 2012-02-28 19:27:21.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bbas/bsta/CMakeLists.txt 2012-07-28 21:02:13.311205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bsta/CMakeLists.txt 2012-12-28 22:37:41.667500323 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bsta/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -62,6 +62,7 @@
AUX_SOURCE_DIRECTORY(Templates bsta_sources)
@@ -389,8 +389,8 @@
Index: vxl-1.17.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2010-08-13 16:48:30.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2012-07-28 21:02:13.311205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2012-12-28 22:37:41.675500323 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -8,6 +8,9 @@
)
@@ -403,8 +403,8 @@
Index: vxl-1.17.0/contrib/brl/bbas/btol/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/btol/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/btol/CMakeLists.txt 2012-07-28 21:02:13.311205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/btol/CMakeLists.txt 2012-12-28 22:37:41.695500323 +0100
++++ vxl-1.17.0/contrib/brl/bbas/btol/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -19,6 +19,7 @@
)
@@ -415,8 +415,8 @@
Index: vxl-1.17.0/contrib/brl/bbas/bugl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bugl/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bugl/CMakeLists.txt 2012-07-28 21:02:13.311205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bugl/CMakeLists.txt 2012-12-28 22:37:41.643500322 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bugl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -26,6 +26,7 @@
AUX_SOURCE_DIRECTORY(Templates bugl_sources)
@@ -427,8 +427,8 @@
TARGET_LINK_LIBRARIES(bugl vnl vgl_algo vgl vbl)
Index: vxl-1.17.0/contrib/brl/bbas/bvgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-03-06 17:58:20.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-07-28 21:02:13.311205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-12-28 22:37:41.623500322 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -38,6 +38,7 @@
#Create BVGL library
@@ -439,8 +439,8 @@
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
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-07-28 21:02:09.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-07-28 21:02:13.311205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-12-28 22:37:46.159500422 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -31,6 +31,9 @@
ENDIF(ECW_FOUND)
@@ -453,8 +453,8 @@
Index: vxl-1.17.0/contrib/brl/bbas/bxml/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bxml/CMakeLists.txt 2011-09-27 19:29:36.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bxml/CMakeLists.txt 2012-07-28 21:02:13.311205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bxml/CMakeLists.txt 2012-12-28 22:37:41.611500322 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bxml/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -27,6 +27,9 @@
AUX_SOURCE_DIRECTORY(Templates bxml_sources)
@@ -467,8 +467,8 @@
IF(EXPAT_FOUND)
Index: vxl-1.17.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2011-11-17 14:11:12.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2012-07-28 21:02:13.311205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2012-12-28 22:37:41.703500324 +0100
++++ vxl-1.17.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -23,6 +23,9 @@
ENDIF (NETLIB_FOUND)
@@ -481,8 +481,8 @@
Index: vxl-1.17.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2011-09-06 00:31:01.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2012-07-28 21:02:13.315205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2012-12-28 22:37:41.555500319 +0100
++++ vxl-1.17.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -14,6 +14,9 @@
AUX_SOURCE_DIRECTORY(processes bvgl_pro_sources)
@@ -495,8 +495,8 @@
Index: vxl-1.17.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-06-27 16:36:06.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-07-28 21:02:13.315205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-12-28 22:37:41.563500321 +0100
++++ vxl-1.17.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -16,6 +16,9 @@
AUX_SOURCE_DIRECTORY(processes vil_pro_sources)
@@ -509,8 +509,8 @@
Index: vxl-1.17.0/contrib/brl/bseg/bmdl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/CMakeLists.txt 2010-09-26 08:37:58.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/bmdl/CMakeLists.txt 2012-07-28 21:02:13.315205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/CMakeLists.txt 2012-12-28 22:37:41.727500324 +0100
++++ vxl-1.17.0/contrib/brl/bseg/bmdl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -16,6 +16,9 @@
AUX_SOURCE_DIRECTORY(Templates bmdl_sources)
@@ -523,8 +523,8 @@
Index: vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-07-28 21:01:06.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-07-28 21:02:13.315205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-12-28 22:37:41.731500324 +0100
++++ vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -31,6 +31,9 @@
AUX_SOURCE_DIRECTORY(processes bmdl_pro_sources)
@@ -537,8 +537,8 @@
vsol brip vpgl_pro vgl vul vpl imesh_algo minizip)
Index: vxl-1.17.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-04-19 18:36:37.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-07-28 21:02:13.315205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-12-28 22:37:41.755500325 +0100
++++ vxl-1.17.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -20,6 +20,9 @@
)
@@ -551,8 +551,8 @@
SUBDIRS(tests)
Index: vxl-1.17.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 22:40:04.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-07-28 21:02:13.319205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-12-28 22:37:41.763500325 +0100
++++ vxl-1.17.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -19,6 +19,9 @@
AUX_SOURCE_DIRECTORY(processes boxm_algo_pro_sources)
@@ -565,8 +565,8 @@
# 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
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/brip/CMakeLists.txt 2012-05-31 19:18:24.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/brip/CMakeLists.txt 2012-07-28 21:02:13.319205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bseg/brip/CMakeLists.txt 2012-12-28 22:37:41.723500324 +0100
++++ vxl-1.17.0/contrib/brl/bseg/brip/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -40,6 +40,7 @@
AUX_SOURCE_DIRECTORY(Templates brip_sources)
@@ -577,8 +577,8 @@
Index: vxl-1.17.0/contrib/brl/bseg/bvpl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/bvpl/CMakeLists.txt 2011-09-10 00:19:29.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/bvpl/CMakeLists.txt 2012-07-28 21:02:13.319205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bseg/bvpl/CMakeLists.txt 2012-12-28 22:37:41.767500325 +0100
++++ vxl-1.17.0/contrib/brl/bseg/bvpl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -19,6 +19,9 @@
AUX_SOURCE_DIRECTORY(Templates bvpl_sources)
@@ -591,8 +591,8 @@
Index: vxl-1.17.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2011-03-04 16:51:24.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2012-07-28 21:02:13.323205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2012-12-28 22:37:41.739500324 +0100
++++ vxl-1.17.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -12,6 +12,9 @@
AUX_SOURCE_DIRECTORY(Templates bvxm_algo_sources)
@@ -605,8 +605,8 @@
Index: vxl-1.17.0/contrib/brl/bseg/sdet/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/sdet/CMakeLists.txt 2012-02-06 18:24:28.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bseg/sdet/CMakeLists.txt 2012-07-28 21:02:13.323205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bseg/sdet/CMakeLists.txt 2012-12-28 22:37:41.743500325 +0100
++++ vxl-1.17.0/contrib/brl/bseg/sdet/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -55,6 +55,7 @@
AUX_SOURCE_DIRECTORY(Templates sdet_sources)
@@ -617,8 +617,8 @@
Index: vxl-1.17.0/contrib/brl/bseg/segv/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/segv/CMakeLists.txt 2011-12-13 20:34:05.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bseg/segv/CMakeLists.txt 2012-07-28 21:02:13.323205970 +0200
+--- vxl-1.17.0.orig/contrib/brl/bseg/segv/CMakeLists.txt 2012-12-28 22:37:41.751500325 +0100
++++ vxl-1.17.0/contrib/brl/bseg/segv/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -33,6 +33,7 @@
)
@@ -629,8 +629,8 @@
Index: vxl-1.17.0/contrib/gel/geml/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/geml/CMakeLists.txt 2010-09-26 08:37:58.000000000 +0200
-+++ vxl-1.17.0/contrib/gel/geml/CMakeLists.txt 2012-07-28 21:02:13.323205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/geml/CMakeLists.txt 2012-12-28 22:37:41.979500330 +0100
++++ vxl-1.17.0/contrib/gel/geml/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -12,6 +12,7 @@
)
@@ -641,8 +641,8 @@
TARGET_LINK_LIBRARIES(geml vil1 vnl)
Index: vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gevd/CMakeLists.txt 2009-12-26 16:49:35.000000000 +0100
-+++ vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt 2012-07-28 21:02:13.323205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/gevd/CMakeLists.txt 2012-12-28 22:37:42.003500330 +0100
++++ vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -33,6 +33,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -653,8 +653,8 @@
TARGET_LINK_LIBRARIES(gevd vtol vsol vdgl vil1 vil vnl vgl vbl vul)
Index: vxl-1.17.0/contrib/gel/gkll/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gkll/CMakeLists.txt 2012-01-13 15:02:10.000000000 +0100
-+++ vxl-1.17.0/contrib/gel/gkll/CMakeLists.txt 2012-07-28 21:02:13.323205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/gkll/CMakeLists.txt 2012-12-28 22:37:42.019500331 +0100
++++ vxl-1.17.0/contrib/gel/gkll/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -20,6 +20,7 @@
ENDIF(BUILD_OXL)
@@ -665,8 +665,8 @@
Index: vxl-1.17.0/contrib/gel/gmvl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gmvl/CMakeLists.txt 2010-09-26 08:37:58.000000000 +0200
-+++ vxl-1.17.0/contrib/gel/gmvl/CMakeLists.txt 2012-07-28 21:02:13.323205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/gmvl/CMakeLists.txt 2012-12-28 22:37:41.991500330 +0100
++++ vxl-1.17.0/contrib/gel/gmvl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -21,6 +21,7 @@
AUX_SOURCE_DIRECTORY(Templates gmvl_sources)
@@ -677,8 +677,8 @@
TARGET_LINK_LIBRARIES(gmvl vtol vil1 vnl vbl vcl)
Index: vxl-1.17.0/contrib/gel/gst/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gst/CMakeLists.txt 2012-07-28 21:01:06.000000000 +0200
-+++ vxl-1.17.0/contrib/gel/gst/CMakeLists.txt 2012-07-28 21:02:13.323205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/gst/CMakeLists.txt 2012-12-28 22:37:41.943500329 +0100
++++ vxl-1.17.0/contrib/gel/gst/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -17,6 +17,7 @@
AUX_SOURCE_DIRECTORY(Templates gst_sources)
@@ -689,8 +689,8 @@
Index: vxl-1.17.0/contrib/gel/gtrl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gtrl/CMakeLists.txt 2011-05-22 16:50:44.000000000 +0200
-+++ vxl-1.17.0/contrib/gel/gtrl/CMakeLists.txt 2012-07-28 21:02:13.323205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/gtrl/CMakeLists.txt 2012-12-28 22:37:41.983500330 +0100
++++ vxl-1.17.0/contrib/gel/gtrl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -25,6 +25,7 @@
ENDIF(NETLIB_FOUND)
@@ -701,8 +701,8 @@
Index: vxl-1.17.0/contrib/gel/vgel/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vgel/CMakeLists.txt 2012-01-12 15:46:48.000000000 +0100
-+++ vxl-1.17.0/contrib/gel/vgel/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/vgel/CMakeLists.txt 2012-12-28 22:37:42.007500329 +0100
++++ vxl-1.17.0/contrib/gel/vgel/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -20,6 +20,7 @@
ENDIF(BUILD_OXL)
@@ -713,8 +713,8 @@
Index: vxl-1.17.0/contrib/gel/vgel/kl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vgel/kl/CMakeLists.txt 2012-01-12 15:46:48.000000000 +0100
-+++ vxl-1.17.0/contrib/gel/vgel/kl/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/vgel/kl/CMakeLists.txt 2012-12-28 22:37:42.015500331 +0100
++++ vxl-1.17.0/contrib/gel/vgel/kl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -15,6 +15,7 @@
)
@@ -725,8 +725,8 @@
Index: vxl-1.17.0/contrib/gel/vifa/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vifa/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/contrib/gel/vifa/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/vifa/CMakeLists.txt 2012-12-28 22:37:41.963500328 +0100
++++ vxl-1.17.0/contrib/gel/vifa/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -31,6 +31,7 @@
AUX_SOURCE_DIRECTORY(Templates vifa_sources)
@@ -737,9 +737,9 @@
TARGET_LINK_LIBRARIES(vifa gevd vtol vsol vdgl vnl vgl vbl vul vil vcl)
Index: vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vmal/CMakeLists.txt 2012-07-28 21:01:06.000000000 +0200
-+++ vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
-@@ -37,6 +37,7 @@
+--- vxl-1.17.0.orig/contrib/gel/vmal/CMakeLists.txt 2012-12-28 22:37:41.967500329 +0100
++++ vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100
+@@ -37,11 +37,12 @@
ADD_LIBRARY(vmal ${vmal_sources})
@@ -747,10 +747,16 @@
INSTALL_TARGETS(/lib vmal)
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/gel/vsol/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vsol/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/contrib/gel/vsol/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/vsol/CMakeLists.txt 2012-12-28 22:37:41.995500330 +0100
++++ vxl-1.17.0/contrib/gel/vsol/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -63,6 +63,7 @@
AUX_SOURCE_DIRECTORY(Templates vsol_sources)
@@ -761,8 +767,8 @@
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
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vsrl/CMakeLists.txt 2012-01-12 18:58:06.000000000 +0100
-+++ vxl-1.17.0/contrib/gel/vsrl/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/gel/vsrl/CMakeLists.txt 2012-12-28 22:37:41.939500329 +0100
++++ vxl-1.17.0/contrib/gel/vsrl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -60,6 +60,7 @@
ENDIF (HAS_VGUI)
@@ -773,8 +779,8 @@
Index: vxl-1.17.0/contrib/mul/ipts/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/ipts/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/contrib/mul/ipts/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/ipts/CMakeLists.txt 2012-12-28 22:37:41.863500327 +0100
++++ vxl-1.17.0/contrib/mul/ipts/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -16,6 +16,7 @@
)
@@ -785,8 +791,8 @@
TARGET_LINK_LIBRARIES(ipts vimt_algo vimt vgl vil_algo vil)
Index: vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mbl/CMakeLists.txt 2010-08-31 14:28:12.000000000 +0200
-+++ vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/mbl/CMakeLists.txt 2012-12-28 22:37:41.867500327 +0100
++++ vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -121,6 +121,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -797,8 +803,8 @@
INSTALL_TARGETS(/lib mbl)
Index: vxl-1.17.0/contrib/mul/mil/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mil/algo/CMakeLists.txt 2011-03-15 16:57:23.000000000 +0100
-+++ vxl-1.17.0/contrib/mul/mil/algo/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/mil/algo/CMakeLists.txt 2012-12-28 22:37:41.895500328 +0100
++++ vxl-1.17.0/contrib/mul/mil/algo/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -15,6 +15,7 @@
AUX_SOURCE_DIRECTORY(Templates mil_algo_sources)
@@ -809,8 +815,8 @@
TARGET_LINK_LIBRARIES(mil_algo mil mbl vnl vsl)
Index: vxl-1.17.0/contrib/mul/mil/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mil/CMakeLists.txt 2009-09-20 16:33:42.000000000 +0200
-+++ vxl-1.17.0/contrib/mul/mil/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/mil/CMakeLists.txt 2012-12-28 22:37:41.891500328 +0100
++++ vxl-1.17.0/contrib/mul/mil/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -37,6 +37,7 @@
AUX_SOURCE_DIRECTORY(Templates mil_sources)
@@ -821,8 +827,8 @@
TARGET_LINK_LIBRARIES(mil mbl vimt vnl vbl_io vgl vil1 vbl vsl)
Index: vxl-1.17.0/contrib/mul/mil3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mil3d/CMakeLists.txt 2009-09-20 16:33:42.000000000 +0200
-+++ vxl-1.17.0/contrib/mul/mil3d/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/mil3d/CMakeLists.txt 2012-12-28 22:37:41.907500328 +0100
++++ vxl-1.17.0/contrib/mul/mil3d/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -20,6 +20,7 @@
AUX_SOURCE_DIRECTORY(Templates mil3d_sources)
@@ -833,8 +839,8 @@
TARGET_LINK_LIBRARIES(mil3d mil vbl_io vnl_io vnl vgl vbl vsl)
Index: vxl-1.17.0/contrib/mul/mvl2/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mvl2/CMakeLists.txt 2010-09-26 08:37:58.000000000 +0200
-+++ vxl-1.17.0/contrib/mul/mvl2/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/mvl2/CMakeLists.txt 2012-12-28 22:37:41.887500328 +0100
++++ vxl-1.17.0/contrib/mul/mvl2/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -52,6 +52,7 @@
ENDIF (AVIFILE_FOUND)
@@ -845,8 +851,8 @@
TARGET_LINK_LIBRARIES( mvl2 vil vul ${AVIFILE_LIBRARIES} )
Index: vxl-1.17.0/contrib/mul/pdf1d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/pdf1d/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/contrib/mul/pdf1d/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/pdf1d/CMakeLists.txt 2012-12-28 22:37:41.903500328 +0100
++++ vxl-1.17.0/contrib/mul/pdf1d/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100
@@ -49,6 +49,7 @@
AUX_SOURCE_DIRECTORY(Templates pdf1d_sources)
@@ -857,8 +863,8 @@
TARGET_LINK_LIBRARIES( pdf1d mbl vbl vnl_io vnl vsl )
Index: vxl-1.17.0/contrib/mul/vil3d/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vil3d/algo/CMakeLists.txt 2011-03-15 16:57:23.000000000 +0100
-+++ vxl-1.17.0/contrib/mul/vil3d/algo/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/vil3d/algo/CMakeLists.txt 2012-12-28 22:37:41.855500327 +0100
++++ vxl-1.17.0/contrib/mul/vil3d/algo/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -36,6 +36,7 @@
AUX_SOURCE_DIRECTORY(Templates vil3d_algo_sources)
@@ -869,8 +875,8 @@
TARGET_LINK_LIBRARIES( vil3d_algo vil3d vil_algo vil vnl vgl )
Index: vxl-1.17.0/contrib/mul/vil3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vil3d/CMakeLists.txt 2010-09-13 17:46:16.000000000 +0200
-+++ vxl-1.17.0/contrib/mul/vil3d/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/vil3d/CMakeLists.txt 2012-12-28 22:37:41.843500327 +0100
++++ vxl-1.17.0/contrib/mul/vil3d/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -49,6 +49,7 @@
AUX_SOURCE_DIRECTORY(Templates vil3d_sources)
@@ -881,8 +887,8 @@
INSTALL_TARGETS(/lib vil3d)
Index: vxl-1.17.0/contrib/mul/vil3d/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vil3d/io/CMakeLists.txt 2006-10-17 15:03:35.000000000 +0200
-+++ vxl-1.17.0/contrib/mul/vil3d/io/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/vil3d/io/CMakeLists.txt 2012-12-28 22:37:41.851500327 +0100
++++ vxl-1.17.0/contrib/mul/vil3d/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -7,6 +7,7 @@
)
@@ -893,8 +899,8 @@
TARGET_LINK_LIBRARIES( vil3d_io vil3d vil_io )
Index: vxl-1.17.0/contrib/mul/vimt/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vimt/algo/CMakeLists.txt 2011-03-15 16:57:23.000000000 +0100
-+++ vxl-1.17.0/contrib/mul/vimt/algo/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/vimt/algo/CMakeLists.txt 2012-12-28 22:37:41.879500328 +0100
++++ vxl-1.17.0/contrib/mul/vimt/algo/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -11,6 +11,7 @@
)
@@ -905,8 +911,8 @@
TARGET_LINK_LIBRARIES( vimt_algo vimt vil_algo vgl vcl )
Index: vxl-1.17.0/contrib/mul/vimt/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vimt/CMakeLists.txt 2010-10-05 08:29:06.000000000 +0200
-+++ vxl-1.17.0/contrib/mul/vimt/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/vimt/CMakeLists.txt 2012-12-28 22:37:41.875500327 +0100
++++ vxl-1.17.0/contrib/mul/vimt/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -35,6 +35,7 @@
AUX_SOURCE_DIRECTORY(Templates vimt_sources)
@@ -917,8 +923,8 @@
TARGET_LINK_LIBRARIES(vimt mbl vil_algo vgl vnl vil_io vil )
Index: vxl-1.17.0/contrib/mul/vimt3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vimt3d/CMakeLists.txt 2010-07-08 18:39:51.000000000 +0200
-+++ vxl-1.17.0/contrib/mul/vimt3d/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/mul/vimt3d/CMakeLists.txt 2012-12-28 22:37:41.835500327 +0100
++++ vxl-1.17.0/contrib/mul/vimt3d/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -34,6 +34,7 @@
AUX_SOURCE_DIRECTORY(Templates vimt3d_sources)
@@ -929,8 +935,8 @@
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
===================================================================
---- vxl-1.17.0.orig/contrib/oul/ouel/CMakeLists.txt 2010-09-26 08:37:58.000000000 +0200
-+++ vxl-1.17.0/contrib/oul/ouel/CMakeLists.txt 2012-07-28 21:02:13.327205970 +0200
+--- vxl-1.17.0.orig/contrib/oul/ouel/CMakeLists.txt 2012-12-28 22:37:41.919500327 +0100
++++ vxl-1.17.0/contrib/oul/ouel/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -11,6 +11,7 @@
)
@@ -941,8 +947,8 @@
TARGET_LINK_LIBRARIES( ouel vnl_algo vnl )
Index: vxl-1.17.0/contrib/oul/oufgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oul/oufgl/CMakeLists.txt 2010-09-26 08:37:58.000000000 +0200
-+++ vxl-1.17.0/contrib/oul/oufgl/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/contrib/oul/oufgl/CMakeLists.txt 2012-12-28 22:37:41.931500329 +0100
++++ vxl-1.17.0/contrib/oul/oufgl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -15,6 +15,7 @@
)
@@ -953,8 +959,8 @@
TARGET_LINK_LIBRARIES( oufgl vil vil1 rt)
Index: vxl-1.17.0/contrib/oul/ouml/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oul/ouml/CMakeLists.txt 2010-09-26 08:37:58.000000000 +0200
-+++ vxl-1.17.0/contrib/oul/ouml/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/contrib/oul/ouml/CMakeLists.txt 2012-12-28 22:37:41.927500329 +0100
++++ vxl-1.17.0/contrib/oul/ouml/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -20,6 +20,7 @@
)
@@ -965,20 +971,27 @@
TARGET_LINK_LIBRARIES( ouml vgl vnl_algo vnl_io vnl vil1 vsl vpl )
Index: vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oxl/osl/CMakeLists.txt 2012-07-28 21:01:06.000000000 +0200
-+++ vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
-@@ -45,6 +45,7 @@
+--- vxl-1.17.0.orig/contrib/oxl/osl/CMakeLists.txt 2012-12-28 22:37:41.543500320 +0100
++++ vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100
+@@ -44,10 +44,11 @@
+ )
AUX_SOURCE_DIRECTORY(Templates osl_sources)
- ADD_LIBRARY(osl ${osl_sources})
-+SET_TARGET_PROPERTIES(osl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
- INSTALL_TARGETS(/lib osl)
+-ADD_LIBRARY(osl ${osl_sources})
+-INSTALL_TARGETS(/lib osl)
++ADD_LIBRARY(oxl_osl ${osl_sources})
++SET_TARGET_PROPERTIES(oxl_osl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib oxl_osl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/osl ${osl_sources})
- TARGET_LINK_LIBRARIES(osl vnl_algo vnl vgl vil1 vbl)
+-TARGET_LINK_LIBRARIES(osl vnl_algo vnl vgl vil1 vbl)
++TARGET_LINK_LIBRARIES(oxl_osl vnl_algo vnl vgl vil1 vbl)
+
+ IF (BUILD_EXAMPLES)
+ SUBDIRS(examples)
Index: vxl-1.17.0/contrib/prip/vmap/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/prip/vmap/CMakeLists.txt 2006-10-17 15:03:35.000000000 +0200
-+++ vxl-1.17.0/contrib/prip/vmap/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/contrib/prip/vmap/CMakeLists.txt 2012-12-28 22:37:41.823500326 +0100
++++ vxl-1.17.0/contrib/prip/vmap/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -28,6 +28,7 @@
)
@@ -989,8 +1002,8 @@
TARGET_LINK_LIBRARIES(vmap vcl)
Index: vxl-1.17.0/contrib/rpl/rgrl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/rpl/rgrl/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/contrib/rpl/rgrl/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/contrib/rpl/rgrl/CMakeLists.txt 2012-12-28 22:37:41.779500325 +0100
++++ vxl-1.17.0/contrib/rpl/rgrl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -161,6 +161,7 @@
AUX_SOURCE_DIRECTORY( Templates rgrl_sources )
@@ -1001,8 +1014,8 @@
TARGET_LINK_LIBRARIES( rgrl rrel rsdl vil3d vil vnl_algo vnl vbl vul)
Index: vxl-1.17.0/contrib/rpl/rgtl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/rpl/rgtl/CMakeLists.txt 2009-03-07 07:44:51.000000000 +0100
-+++ vxl-1.17.0/contrib/rpl/rgtl/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/contrib/rpl/rgtl/CMakeLists.txt 2012-12-28 22:37:41.799500326 +0100
++++ vxl-1.17.0/contrib/rpl/rgtl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -84,6 +84,7 @@
)
@@ -1013,8 +1026,8 @@
INSTALL_TARGETS(/lib rgtl)
Index: vxl-1.17.0/contrib/rpl/rtvl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/rpl/rtvl/CMakeLists.txt 2010-09-26 08:37:58.000000000 +0200
-+++ vxl-1.17.0/contrib/rpl/rtvl/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/contrib/rpl/rtvl/CMakeLists.txt 2012-12-28 22:37:41.787500325 +0100
++++ vxl-1.17.0/contrib/rpl/rtvl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -41,6 +41,7 @@
)
@@ -1025,8 +1038,8 @@
INSTALL_TARGETS(/lib rtvl)
Index: vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/tbl/vepl/CMakeLists.txt 2011-12-27 15:15:45.000000000 +0100
-+++ vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/contrib/tbl/vepl/CMakeLists.txt 2012-12-28 22:37:41.803500326 +0100
++++ vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -52,6 +52,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1037,8 +1050,8 @@
TARGET_LINK_LIBRARIES(vepl vipl vil ${CMAKE_THREAD_LIBS})
Index: vxl-1.17.0/core/testlib/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/testlib/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/core/testlib/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/core/testlib/CMakeLists.txt 2012-12-28 22:37:42.095500332 +0100
++++ vxl-1.17.0/core/testlib/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -29,6 +29,7 @@
)
@@ -1049,8 +1062,8 @@
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/testlib ${testlib_sources})
Index: vxl-1.17.0/core/vbl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vbl/CMakeLists.txt 2011-12-16 23:41:06.000000000 +0100
-+++ vxl-1.17.0/core/vbl/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/core/vbl/CMakeLists.txt 2012-12-28 22:37:42.119500333 +0100
++++ vxl-1.17.0/core/vbl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -42,6 +42,7 @@
AUX_SOURCE_DIRECTORY(Templates vbl_sources)
@@ -1061,8 +1074,8 @@
INSTALL_TARGETS(/lib vbl)
Index: vxl-1.17.0/core/vbl/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vbl/io/CMakeLists.txt 2006-10-17 15:03:35.000000000 +0200
-+++ vxl-1.17.0/core/vbl/io/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/core/vbl/io/CMakeLists.txt 2012-12-28 22:37:42.123500333 +0100
++++ vxl-1.17.0/core/vbl/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -17,6 +17,7 @@
AUX_SOURCE_DIRECTORY(Templates vbl_io_sources)
@@ -1073,8 +1086,8 @@
INSTALL_TARGETS(/lib vbl_io)
Index: vxl-1.17.0/core/vcsl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vcsl/CMakeLists.txt 2009-05-13 21:46:07.000000000 +0200
-+++ vxl-1.17.0/core/vcsl/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/core/vcsl/CMakeLists.txt 2012-12-28 22:37:42.099500331 +0100
++++ vxl-1.17.0/core/vcsl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -63,6 +63,7 @@
AUX_SOURCE_DIRECTORY( Templates vcsl_sources )
@@ -1085,8 +1098,8 @@
INSTALL_TARGETS(/lib vcsl)
Index: vxl-1.17.0/core/vgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgl/CMakeLists.txt 2010-09-17 21:49:56.000000000 +0200
-+++ vxl-1.17.0/core/vgl/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/core/vgl/CMakeLists.txt 2012-12-28 22:37:42.047500331 +0100
++++ vxl-1.17.0/core/vgl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -69,6 +69,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_sources)
@@ -1097,8 +1110,8 @@
#DEPENDS core/vsl core/vnl
Index: vxl-1.17.0/core/vgl/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgl/io/CMakeLists.txt 2010-08-25 18:11:07.000000000 +0200
-+++ vxl-1.17.0/core/vgl/io/CMakeLists.txt 2012-07-28 21:02:13.331205969 +0200
+--- vxl-1.17.0.orig/core/vgl/io/CMakeLists.txt 2012-12-28 22:37:42.055500330 +0100
++++ vxl-1.17.0/core/vgl/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -29,6 +29,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_io_sources)
@@ -1109,8 +1122,8 @@
INSTALL_TARGETS(/lib vgl_io)
Index: vxl-1.17.0/core/vgui/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgui/CMakeLists.txt 2011-05-22 16:50:44.000000000 +0200
-+++ vxl-1.17.0/core/vgui/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vgui/CMakeLists.txt 2012-12-28 22:37:42.083500332 +0100
++++ vxl-1.17.0/core/vgui/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -518,6 +518,7 @@
)
@@ -1121,8 +1134,8 @@
SET( VGUI_FOUND "YES" CACHE INTERNAL "Was vgui successfully built?" )
Index: vxl-1.17.0/core/vgui/wx/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgui/wx/CMakeLists.txt 2011-11-27 10:50:40.000000000 +0100
-+++ vxl-1.17.0/core/vgui/wx/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vgui/wx/CMakeLists.txt 2012-12-28 22:37:42.091500332 +0100
++++ vxl-1.17.0/core/vgui/wx/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -24,6 +24,7 @@
)
@@ -1133,8 +1146,8 @@
IF (BUILD_TESTING)
Index: vxl-1.17.0/core/vidl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vidl/CMakeLists.txt 2011-12-17 19:52:25.000000000 +0100
-+++ vxl-1.17.0/core/vidl/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vidl/CMakeLists.txt 2012-12-28 22:37:42.031500331 +0100
++++ vxl-1.17.0/core/vidl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -128,6 +128,7 @@
AUX_SOURCE_DIRECTORY(Templates vidl_sources)
@@ -1145,8 +1158,8 @@
Index: vxl-1.17.0/core/vidl/gui/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vidl/gui/CMakeLists.txt 2011-05-22 16:50:44.000000000 +0200
-+++ vxl-1.17.0/core/vidl/gui/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vidl/gui/CMakeLists.txt 2012-12-28 22:37:42.039500331 +0100
++++ vxl-1.17.0/core/vidl/gui/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -12,6 +12,7 @@
)
@@ -1157,8 +1170,8 @@
TARGET_LINK_LIBRARIES( vidl_gui vidl vgui vil )
Index: vxl-1.17.0/core/vil/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil/algo/CMakeLists.txt 2011-04-20 19:05:57.000000000 +0200
-+++ vxl-1.17.0/core/vil/algo/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vil/algo/CMakeLists.txt 2012-12-28 22:37:42.143500332 +0100
++++ vxl-1.17.0/core/vil/algo/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -57,6 +57,7 @@
AUX_SOURCE_DIRECTORY(Templates vil_algo_sources)
@@ -1169,8 +1182,8 @@
Index: vxl-1.17.0/core/vil/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil/CMakeLists.txt 2011-05-22 16:50:44.000000000 +0200
-+++ vxl-1.17.0/core/vil/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vil/CMakeLists.txt 2012-12-28 22:37:42.131500333 +0100
++++ vxl-1.17.0/core/vil/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -340,6 +340,7 @@
TARGET_LINK_LIBRARIES( vil nsl vil_network socket )
ENDIF (SOLARIS)
@@ -1181,8 +1194,8 @@
${vil_network_sources}
Index: vxl-1.17.0/core/vil/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil/io/CMakeLists.txt 2011-03-16 16:00:16.000000000 +0100
-+++ vxl-1.17.0/core/vil/io/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vil/io/CMakeLists.txt 2012-12-28 22:37:42.135500333 +0100
++++ vxl-1.17.0/core/vil/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -15,6 +15,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1193,8 +1206,8 @@
INSTALL_TARGETS(/lib vil_io)
Index: vxl-1.17.0/core/vil1/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil1/CMakeLists.txt 2011-05-22 16:50:44.000000000 +0200
-+++ vxl-1.17.0/core/vil1/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vil1/CMakeLists.txt 2012-12-28 22:37:42.067500332 +0100
++++ vxl-1.17.0/core/vil1/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -169,6 +169,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1205,8 +1218,8 @@
Index: vxl-1.17.0/core/vil1/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil1/io/CMakeLists.txt 2008-02-24 15:55:44.000000000 +0100
-+++ vxl-1.17.0/core/vil1/io/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vil1/io/CMakeLists.txt 2012-12-28 22:37:42.071500332 +0100
++++ vxl-1.17.0/core/vil1/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -15,6 +15,7 @@
AUX_SOURCE_DIRECTORY(Templates vil1_io_sources)
@@ -1217,8 +1230,8 @@
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1/io ${vil1_io_sources})
Index: vxl-1.17.0/core/vnl/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vnl/algo/CMakeLists.txt 2011-05-22 16:50:44.000000000 +0200
-+++ vxl-1.17.0/core/vnl/algo/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vnl/algo/CMakeLists.txt 2012-12-28 22:37:42.167500334 +0100
++++ vxl-1.17.0/core/vnl/algo/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -102,6 +102,7 @@
AUX_SOURCE_DIRECTORY(Templates vnl_algo_sources)
@@ -1229,8 +1242,8 @@
INSTALL_TARGETS(/lib vnl_algo)
Index: vxl-1.17.0/core/vnl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vnl/CMakeLists.txt 2011-10-04 21:41:57.000000000 +0200
-+++ vxl-1.17.0/core/vnl/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vnl/CMakeLists.txt 2012-12-28 22:37:42.147500333 +0100
++++ vxl-1.17.0/core/vnl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -264,6 +264,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1241,8 +1254,8 @@
INSTALL_TARGETS(/lib vnl)
Index: vxl-1.17.0/core/vnl/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vnl/io/CMakeLists.txt 2006-10-17 15:03:35.000000000 +0200
-+++ vxl-1.17.0/core/vnl/io/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vnl/io/CMakeLists.txt 2012-12-28 22:37:42.159500334 +0100
++++ vxl-1.17.0/core/vnl/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -26,6 +26,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1253,8 +1266,8 @@
INSTALL_TARGETS(/lib vnl_io)
Index: vxl-1.17.0/core/vnl/xio/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vnl/xio/CMakeLists.txt 2011-07-29 23:32:53.000000000 +0200
-+++ vxl-1.17.0/core/vnl/xio/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vnl/xio/CMakeLists.txt 2012-12-28 22:37:42.151500334 +0100
++++ vxl-1.17.0/core/vnl/xio/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -11,6 +11,7 @@
AUX_SOURCE_DIRECTORY(Templates vnl_xio_sources)
@@ -1265,8 +1278,8 @@
INSTALL_TARGETS(/lib vnl_xio)
Index: vxl-1.17.0/core/vpdl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vpdl/CMakeLists.txt 2010-03-01 19:40:31.000000000 +0100
-+++ vxl-1.17.0/core/vpdl/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vpdl/CMakeLists.txt 2012-12-28 22:37:42.079500332 +0100
++++ vxl-1.17.0/core/vpdl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -48,6 +48,7 @@
AUX_SOURCE_DIRECTORY(Templates vpdl_sources)
@@ -1277,8 +1290,8 @@
INSTALL_TARGETS(/lib vpdl)
Index: vxl-1.17.0/core/vsl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vsl/CMakeLists.txt 2010-06-21 18:41:49.000000000 +0200
-+++ vxl-1.17.0/core/vsl/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vsl/CMakeLists.txt 2012-12-28 22:37:42.043500331 +0100
++++ vxl-1.17.0/core/vsl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -36,6 +36,7 @@
AUX_SOURCE_DIRECTORY(Templates vsl_sources)
@@ -1289,8 +1302,8 @@
INSTALL_TARGETS(/lib vsl)
Index: vxl-1.17.0/core/vul/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vul/io/CMakeLists.txt 2006-10-17 15:03:35.000000000 +0200
-+++ vxl-1.17.0/core/vul/io/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/core/vul/io/CMakeLists.txt 2012-12-28 22:37:42.111500333 +0100
++++ vxl-1.17.0/core/vul/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100
@@ -5,6 +5,7 @@
)
@@ -1301,8 +1314,8 @@
INSTALL_TARGETS(/lib vul_io)
Index: vxl-1.17.0/v3p/dcmtk/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/v3p/dcmtk/CMakeLists.txt 2011-05-22 16:50:44.000000000 +0200
-+++ vxl-1.17.0/v3p/dcmtk/CMakeLists.txt 2012-07-28 21:02:13.335205969 +0200
+--- vxl-1.17.0.orig/v3p/dcmtk/CMakeLists.txt 2012-12-28 22:37:41.523500320 +0100
++++ vxl-1.17.0/v3p/dcmtk/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100
@@ -453,6 +453,7 @@
TARGET_LINK_LIBRARIES( dcmtk ${ZLIB_LIBRARIES} )
ENDIF( DCMTK_HAVE_ZLIB )
@@ -1313,8 +1326,8 @@
IF( BUILD_TESTING )
Index: vxl-1.17.0/vcl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/vcl/CMakeLists.txt 2010-04-28 23:11:33.000000000 +0200
-+++ vxl-1.17.0/vcl/CMakeLists.txt 2012-07-28 21:02:13.339205969 +0200
+--- vxl-1.17.0.orig/vcl/CMakeLists.txt 2012-12-28 22:37:42.027500331 +0100
++++ vxl-1.17.0/vcl/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100
@@ -360,6 +360,7 @@
#AUX_SOURCE_DIRECTORY(Templates vcl_sources)
@@ -1325,8 +1338,8 @@
# Windows too. No need to do manual config.
Index: vxl-1.17.0/contrib/brl/b3p/expatpp/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/b3p/expatpp/CMakeLists.txt 2011-09-27 19:34:23.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/b3p/expatpp/CMakeLists.txt 2012-07-28 21:02:13.339205969 +0200
+--- vxl-1.17.0.orig/contrib/brl/b3p/expatpp/CMakeLists.txt 2012-12-28 22:37:41.583500321 +0100
++++ vxl-1.17.0/contrib/brl/b3p/expatpp/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100
@@ -12,6 +12,9 @@
SET( expatpp_sources expatpp.h expatpp.cpp expatpplib.h )
@@ -1339,8 +1352,8 @@
IF( BUILD_TESTING )
Index: vxl-1.17.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-05-16 14:15:20.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-07-28 21:02:13.339205969 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-12-28 22:37:41.615500322 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100
@@ -12,7 +12,9 @@
AUX_SOURCE_DIRECTORY(Templates bsvg_sources)
@@ -1354,8 +1367,8 @@
IF( BUILD_TESTING )
Index: vxl-1.17.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2011-09-27 19:29:36.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2012-07-28 21:02:13.339205969 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2012-12-28 22:37:41.683500323 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100
@@ -32,7 +32,9 @@
)
@@ -1369,8 +1382,8 @@
SUBDIRS( algo )
Index: vxl-1.17.0/contrib/brl/bpro/bprb/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bpro/bprb/CMakeLists.txt 2011-09-27 19:30:58.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bpro/bprb/CMakeLists.txt 2012-07-28 21:02:13.339205969 +0200
+--- vxl-1.17.0.orig/contrib/brl/bpro/bprb/CMakeLists.txt 2012-12-28 22:37:41.571500321 +0100
++++ vxl-1.17.0/contrib/brl/bpro/bprb/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100
@@ -18,7 +18,9 @@
AUX_SOURCE_DIRECTORY(Templates bprb_sources)
@@ -1384,8 +1397,8 @@
IF(BUILD_TESTING)
Index: vxl-1.17.0/contrib/brl/bbas/brdb/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/brdb/CMakeLists.txt 2011-09-27 19:29:36.000000000 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/brdb/CMakeLists.txt 2012-07-28 21:02:13.339205969 +0200
+--- vxl-1.17.0.orig/contrib/brl/bbas/brdb/CMakeLists.txt 2012-12-28 22:37:41.651500322 +0100
++++ vxl-1.17.0/contrib/brl/bbas/brdb/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100
@@ -15,7 +15,9 @@
AUX_SOURCE_DIRECTORY(Templates brdb_sources)
@@ -1399,8 +1412,8 @@
Index: vxl-1.17.0/contrib/brl/bseg/boct/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/boct/CMakeLists.txt 2011-12-27 00:39:26.000000000 +0100
-+++ vxl-1.17.0/contrib/brl/bseg/boct/CMakeLists.txt 2012-07-28 21:02:13.339205969 +0200
+--- vxl-1.17.0.orig/contrib/brl/bseg/boct/CMakeLists.txt 2012-12-28 22:37:41.775500325 +0100
++++ vxl-1.17.0/contrib/brl/bseg/boct/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100
@@ -14,7 +14,9 @@
AUX_SOURCE_DIRECTORY(Templates boct_sources)
@@ -1412,26 +1425,10 @@
TARGET_LINK_LIBRARIES(boct vcl vgl vgl_io vnl_io vbl vnl)
#tests
---- vxl-1.17.0.orig/contrib/oxl/osl/CMakeLists.txt
-+++ vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt
-@@ -44,11 +44,11 @@ SET(osl_sources
- )
- AUX_SOURCE_DIRECTORY(Templates osl_sources)
-
--ADD_LIBRARY(osl ${osl_sources})
--SET_TARGET_PROPERTIES(osl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
--INSTALL_TARGETS(/lib osl)
-+ADD_LIBRARY(oxl_osl ${osl_sources})
-+SET_TARGET_PROPERTIES(oxl_osl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib oxl_osl)
- INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/osl ${osl_sources})
--TARGET_LINK_LIBRARIES(osl vnl_algo vnl vgl vil1 vbl)
-+TARGET_LINK_LIBRARIES(oxl_osl vnl_algo vnl vgl vil1 vbl)
-
- IF (BUILD_EXAMPLES)
- SUBDIRS(examples)
---- vxl-1.17.0.orig/contrib/oxl/osl/tests/CMakeLists.txt
-+++ vxl-1.17.0/contrib/oxl/osl/tests/CMakeLists.txt
+Index: vxl-1.17.0/contrib/oxl/osl/tests/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/oxl/osl/tests/CMakeLists.txt 2012-12-28 22:37:41.551500320 +0100
++++ vxl-1.17.0/contrib/oxl/osl/tests/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100
@@ -1,4 +1,4 @@
ADD_EXECUTABLE( osl_test_include test_include.cxx )
-TARGET_LINK_LIBRARIES( osl_test_include osl )
@@ -1439,14 +1436,3 @@
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/gel/vmal/CMakeLists.txt
-+++ vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt
-@@ -42,7 +42,7 @@ INSTALL_TARGETS(/lib vmal)
- 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)
More information about the debian-med-commit
mailing list