[med-svn] r11157 - trunk/packages/vxl/branches/experimental/debian/patches
Mathieu Malaterre
malat at alioth.debian.org
Fri Jun 1 14:13:55 UTC 2012
Author: malat
Date: 2012-06-01 14:13:55 +0000 (Fri, 01 Jun 2012)
New Revision: 11157
Modified:
trunk/packages/vxl/branches/experimental/debian/patches/vxl.soname.patch
Log:
Refresh patch
Modified: trunk/packages/vxl/branches/experimental/debian/patches/vxl.soname.patch
===================================================================
--- trunk/packages/vxl/branches/experimental/debian/patches/vxl.soname.patch 2012-06-01 14:12:49 UTC (rev 11156)
+++ trunk/packages/vxl/branches/experimental/debian/patches/vxl.soname.patch 2012-06-01 14:13:55 UTC (rev 11157)
@@ -2,10 +2,10 @@
Author: Mathieu Malaterre <malat at debian.org>
Last-Update: 2011-07-24
-Index: vxl-1.17.0/CMakeLists.txt
+Index: vxl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/CMakeLists.txt 2012-06-01 15:44:00.729753582 +0200
-+++ vxl-1.17.0/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+--- vxl.orig/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/CMakeLists.txt 2012-06-01 16:12:16.197730174 +0200
@@ -12,6 +12,26 @@
PROJECT(vxl)
@@ -33,10 +33,10 @@
SET( LIBRARY_OUTPUT_PATH ${vxl_BINARY_DIR}/lib CACHE PATH
"Output directory for the vxl libraries" )
-Index: vxl-1.17.0/v3p/netlib/CMakeLists.txt
+Index: vxl/v3p/netlib/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/v3p/netlib/CMakeLists.txt 2012-06-01 15:44:00.737753582 +0200
-+++ vxl-1.17.0/v3p/netlib/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+--- vxl.orig/v3p/netlib/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/v3p/netlib/CMakeLists.txt 2012-06-01 16:12:16.197730174 +0200
@@ -8,6 +8,7 @@
)
@@ -53,10 +53,10 @@
INSTALL_TARGETS( /lib v3p_netlib )
INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${v3p_netlib_sources})
IF(UNIX)
-Index: vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt
+Index: vxl/contrib/rpl/rsdl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/rpl/rsdl/CMakeLists.txt 2012-06-01 15:44:00.781753581 +0200
-+++ vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+--- vxl.orig/contrib/rpl/rsdl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/rpl/rsdl/CMakeLists.txt 2012-06-01 16:12:16.197730174 +0200
@@ -21,6 +21,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -65,10 +65,10 @@
INSTALL_TARGETS(/lib rsdl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rsdl ${rsdl_sources})
TARGET_LINK_LIBRARIES( rsdl vnl vbl )
-Index: vxl-1.17.0/contrib/mul/clsfy/CMakeLists.txt
+Index: vxl/contrib/mul/clsfy/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/clsfy/CMakeLists.txt 2012-06-01 15:44:00.821753579 +0200
-+++ vxl-1.17.0/contrib/mul/clsfy/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+--- vxl.orig/contrib/mul/clsfy/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/clsfy/CMakeLists.txt 2012-06-01 16:12:16.197730174 +0200
@@ -53,6 +53,7 @@
AUX_SOURCE_DIRECTORY(Templates clsfy_sources)
@@ -77,10 +77,10 @@
INSTALL_TARGETS(/lib clsfy)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/clsfy ${clsfy_sources})
TARGET_LINK_LIBRARIES(clsfy vpdfl mbl vnl_algo vnl_io vnl vbl vsl vul)
-Index: vxl-1.17.0/contrib/mul/vpdfl/CMakeLists.txt
+Index: vxl/contrib/mul/vpdfl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vpdfl/CMakeLists.txt 2012-06-01 15:44:00.825753579 +0200
-+++ vxl-1.17.0/contrib/mul/vpdfl/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+--- vxl.orig/contrib/mul/vpdfl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/vpdfl/CMakeLists.txt 2012-06-01 16:12:16.197730174 +0200
@@ -37,6 +37,7 @@
AUX_SOURCE_DIRECTORY(Templates vpdfl_sources)
@@ -89,10 +89,10 @@
INSTALL_TARGETS(/lib vpdfl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vpdfl ${vpdfl_sources})
TARGET_LINK_LIBRARIES(vpdfl mbl vnl_algo vnl_io vnl vsl vul)
-Index: vxl-1.17.0/v3p/Qv/CMakeLists.txt
+Index: vxl/v3p/Qv/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/v3p/Qv/CMakeLists.txt 2012-06-01 15:44:00.749753580 +0200
-+++ vxl-1.17.0/v3p/Qv/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+--- vxl.orig/v3p/Qv/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/v3p/Qv/CMakeLists.txt 2012-06-01 16:12:16.197730174 +0200
@@ -169,6 +169,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -101,10 +101,10 @@
TARGET_LINK_LIBRARIES( Qv vcl )
-Index: vxl-1.17.0/contrib/prip/vpyr/CMakeLists.txt
+Index: vxl/contrib/prip/vpyr/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/prip/vpyr/CMakeLists.txt 2012-06-01 15:44:00.961753578 +0200
-+++ vxl-1.17.0/contrib/prip/vpyr/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+--- vxl.orig/contrib/prip/vpyr/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/prip/vpyr/CMakeLists.txt 2012-06-01 16:12:16.197730174 +0200
@@ -23,6 +23,7 @@
)
@@ -113,10 +113,10 @@
INSTALL_TARGETS(/lib vpyr)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vpyr ${vpyr_sources})
TARGET_LINK_LIBRARIES(vpyr vmap)
-Index: vxl-1.17.0/core/vgl/algo/CMakeLists.txt
+Index: vxl/core/vgl/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgl/algo/CMakeLists.txt 2012-06-01 15:44:01.821753567 +0200
-+++ vxl-1.17.0/core/vgl/algo/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+--- vxl.orig/core/vgl/algo/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/core/vgl/algo/CMakeLists.txt 2012-06-01 16:12:16.197730174 +0200
@@ -44,6 +44,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_algo_sources)
@@ -125,10 +125,10 @@
TARGET_LINK_LIBRARIES( vgl_algo vgl vnl_algo vnl )
INSTALL_TARGETS(/lib vgl_algo)
-Index: vxl-1.17.0/contrib/brl/bbas/bgrl/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bgrl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bgrl/CMakeLists.txt 2012-06-01 15:44:01.021753578 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bgrl/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+--- vxl.orig/contrib/brl/bbas/bgrl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bgrl/CMakeLists.txt 2012-06-01 16:12:16.197730174 +0200
@@ -19,6 +19,7 @@
AUX_SOURCE_DIRECTORY(Templates bgrl_sources)
@@ -137,10 +137,10 @@
INSTALL_TARGETS(/lib bgrl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl ${bgrl_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bgrl2/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bgrl2/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bgrl2/CMakeLists.txt 2012-06-01 15:44:01.029753578 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bgrl2/CMakeLists.txt 2012-06-01 15:44:08.969753468 +0200
+--- vxl.orig/contrib/brl/bbas/bgrl2/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bgrl2/CMakeLists.txt 2012-06-01 16:12:16.201730173 +0200
@@ -17,7 +17,9 @@
)
@@ -152,10 +152,10 @@
TARGET_LINK_LIBRARIES( bgrl2 vbl )
#Algorithms on graphs
-Index: vxl-1.17.0/contrib/gel/vdgl/CMakeLists.txt
+Index: vxl/contrib/gel/vdgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vdgl/CMakeLists.txt 2012-06-01 15:44:01.561753569 +0200
-+++ vxl-1.17.0/contrib/gel/vdgl/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+--- vxl.orig/contrib/gel/vdgl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/vdgl/CMakeLists.txt 2012-06-01 16:12:16.201730173 +0200
@@ -23,6 +23,7 @@
AUX_SOURCE_DIRECTORY(Templates vdgl_sources)
@@ -164,10 +164,10 @@
INSTALL_TARGETS(/lib vdgl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vdgl ${vdgl_sources})
TARGET_LINK_LIBRARIES(vdgl vsol vgl_algo vgl vnl_algo vnl vbl_io vbl vsl vul vcl)
-Index: vxl-1.17.0/contrib/gel/vtol/algo/CMakeLists.txt
+Index: vxl/contrib/gel/vtol/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vtol/algo/CMakeLists.txt 2012-06-01 15:44:01.573753570 +0200
-+++ vxl-1.17.0/contrib/gel/vtol/algo/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+--- vxl.orig/contrib/gel/vtol/algo/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/vtol/algo/CMakeLists.txt 2012-06-01 16:12:16.201730173 +0200
@@ -8,6 +8,7 @@
AUX_SOURCE_DIRECTORY( Templates vtol_algo_sources )
@@ -176,10 +176,10 @@
INSTALL_TARGETS(/lib vtol_algo)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vtol/algo ${vtol_algo_sources})
TARGET_LINK_LIBRARIES( vtol_algo vtol vsol vdgl vil_algo vgl_algo vgl vil vbl )
-Index: vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt
+Index: vxl/contrib/gel/vtol/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vtol/CMakeLists.txt 2012-06-01 15:44:01.585753570 +0200
-+++ vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+--- vxl.orig/contrib/gel/vtol/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/vtol/CMakeLists.txt 2012-06-01 16:12:16.201730173 +0200
@@ -35,6 +35,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -188,10 +188,10 @@
INSTALL_TARGETS(/lib vtol)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vtol ${vtol_sources})
TARGET_LINK_LIBRARIES(vtol vdgl vsol vnl vbl vul ${CMAKE_THREAD_LIBS})
-Index: vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt
+Index: vxl/contrib/oxl/mvl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oxl/mvl/CMakeLists.txt 2012-06-01 15:44:01.737753568 +0200
-+++ vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+--- vxl.orig/contrib/oxl/mvl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/oxl/mvl/CMakeLists.txt 2012-06-01 16:12:16.201730173 +0200
@@ -113,6 +113,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -200,10 +200,10 @@
INSTALL_TARGETS(/lib mvl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/mvl ${mvl_sources})
TARGET_LINK_LIBRARIES(mvl vil1 vnl_algo vnl vbl vgl vgl_algo vul)
-Index: vxl-1.17.0/contrib/prip/vdtop/CMakeLists.txt
+Index: vxl/contrib/prip/vdtop/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/prip/vdtop/CMakeLists.txt 2012-06-01 15:44:00.973753577 +0200
-+++ vxl-1.17.0/contrib/prip/vdtop/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+--- vxl.orig/contrib/prip/vdtop/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/prip/vdtop/CMakeLists.txt 2012-06-01 16:12:16.201730173 +0200
@@ -26,6 +26,7 @@
)
@@ -212,10 +212,10 @@
INSTALL_TARGETS(/lib vdtop)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vdtop ${vdtop_sources})
TARGET_LINK_LIBRARIES(vdtop vmap vil)
-Index: vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt
+Index: vxl/contrib/brl/b3p/minizip/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2012-06-01 15:44:01.265753573 +0200
-+++ vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+--- vxl.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/b3p/minizip/CMakeLists.txt 2012-06-01 16:12:16.201730173 +0200
@@ -22,6 +22,8 @@
ENDIF(WIN32)
@@ -225,10 +225,10 @@
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/minizip ${minizip_sources})
ENDIF(ZLIB_FOUND)
-Index: vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt
+Index: vxl/contrib/tbl/vipl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/tbl/vipl/CMakeLists.txt 2012-06-01 15:44:01.757753567 +0200
-+++ vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+--- vxl.orig/contrib/tbl/vipl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/tbl/vipl/CMakeLists.txt 2012-06-01 16:12:16.201730173 +0200
@@ -77,6 +77,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -237,10 +237,10 @@
INSTALL_TARGETS(/lib vipl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vipl ${vipl_sources})
TARGET_LINK_LIBRARIES(vipl vil vil1 vnl vbl)
-Index: vxl-1.17.0/core/vul/CMakeLists.txt
+Index: vxl/core/vul/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vul/CMakeLists.txt 2012-06-01 15:44:01.865753566 +0200
-+++ vxl-1.17.0/core/vul/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+--- vxl.orig/core/vul/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vul/CMakeLists.txt 2012-06-01 16:12:16.201730173 +0200
@@ -76,6 +76,7 @@
ENDIF(APPLE)
@@ -249,10 +249,10 @@
TARGET_LINK_LIBRARIES( vul vcl )
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vul
-Index: vxl-1.17.0/contrib/brl/bbas/bdgl/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bdgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bdgl/CMakeLists.txt 2012-06-01 15:44:01.045753576 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bdgl/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+--- vxl.orig/contrib/brl/bbas/bdgl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bdgl/CMakeLists.txt 2012-06-01 16:12:16.201730173 +0200
@@ -20,6 +20,7 @@
)
@@ -261,10 +261,10 @@
INSTALL_TARGETS(/lib bdgl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bdgl ${bdgl_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bdpg/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bdpg/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bdpg/CMakeLists.txt 2012-06-01 15:44:01.049753576 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bdpg/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+--- vxl.orig/contrib/brl/bbas/bdpg/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bdpg/CMakeLists.txt 2012-06-01 16:12:16.201730173 +0200
@@ -10,6 +10,7 @@
AUX_SOURCE_DIRECTORY(Templates bdpg_sources)
@@ -273,10 +273,10 @@
INSTALL_TARGETS(/lib bdpg)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bdpg ${bdpg_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bgui/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bgui/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bgui/CMakeLists.txt 2012-06-01 15:44:01.057753576 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bgui/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+--- vxl.orig/contrib/brl/bbas/bgui/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bgui/CMakeLists.txt 2012-06-01 16:12:16.201730173 +0200
@@ -38,6 +38,7 @@
AUX_SOURCE_DIRECTORY(Templates bgui_sources)
@@ -285,10 +285,10 @@
INSTALL_TARGETS(/lib bgui)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgui ${bgui_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bgui3d/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bgui3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bgui3d/CMakeLists.txt 2012-06-01 15:44:01.065753577 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bgui3d/CMakeLists.txt 2012-06-01 15:44:08.973753468 +0200
+--- vxl.orig/contrib/brl/bbas/bgui3d/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bgui3d/CMakeLists.txt 2012-06-01 16:12:16.205730172 +0200
@@ -60,6 +60,7 @@
)
@@ -297,10 +297,10 @@
SET(BGUI3D_FOUND "YES" CACHE INTERNAL "Was bgui3d successfully built?" )
TARGET_LINK_LIBRARIES(bgui3d ${COIN3D_LIBRARY} vgui vpgl vnl_algo vnl vgl_algo vgl vul)
-Index: vxl-1.17.0/contrib/brl/bbas/bil/algo/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bil/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bil/algo/CMakeLists.txt 2012-06-01 15:44:01.077753577 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bil/algo/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+--- vxl.orig/contrib/brl/bbas/bil/algo/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bil/algo/CMakeLists.txt 2012-06-01 16:12:16.205730172 +0200
@@ -31,6 +31,9 @@
AUX_SOURCE_DIRECTORY(Templates bil_algo_sources)
@@ -311,10 +311,10 @@
TARGET_LINK_LIBRARIES( bil_algo vil_algo vil vnl_algo vnl vgl_algo vgl vbl vsol)
-Index: vxl-1.17.0/contrib/brl/bbas/bil/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bil/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bil/CMakeLists.txt 2012-06-01 15:44:01.085753577 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bil/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+--- vxl.orig/contrib/brl/bbas/bil/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bil/CMakeLists.txt 2012-06-01 16:12:16.205730172 +0200
@@ -11,6 +11,9 @@
AUX_SOURCE_DIRECTORY(Templates bil_sources)
@@ -325,10 +325,10 @@
TARGET_LINK_LIBRARIES(bil vil vil_io vsl vidl)
-Index: vxl-1.17.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2012-06-01 15:44:01.097753577 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+--- vxl.orig/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2012-06-01 16:12:16.205730172 +0200
@@ -13,6 +13,9 @@
)
@@ -339,10 +339,10 @@
TARGET_LINK_LIBRARIES( bmsh3d_algo bmsh3d rply vgl vnl vul)
IF( BUILD_TESTING )
-Index: vxl-1.17.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bnl/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2012-06-01 15:44:01.117753575 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+--- vxl.orig/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2012-06-01 16:12:16.205730172 +0200
@@ -5,6 +5,7 @@
)
@@ -351,10 +351,10 @@
INSTALL_TARGETS(/lib bnl_algo)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bnl/algo ${bnl_algo_sources})
TARGET_LINK_LIBRARIES( bnl_algo vnl )
-Index: vxl-1.17.0/contrib/brl/bbas/bnl/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bnl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bnl/CMakeLists.txt 2012-06-01 15:44:01.125753575 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bnl/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+--- vxl.orig/contrib/brl/bbas/bnl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bnl/CMakeLists.txt 2012-06-01 16:12:16.205730172 +0200
@@ -8,6 +8,7 @@
)
@@ -363,10 +363,10 @@
INSTALL_TARGETS(/lib bnl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bnl ${bnl_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bsol/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bsol/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bsol/CMakeLists.txt 2012-06-01 15:44:01.133753575 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bsol/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+--- vxl.orig/contrib/brl/bbas/bsol/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bsol/CMakeLists.txt 2012-06-01 16:12:16.205730172 +0200
@@ -24,6 +24,7 @@
AUX_SOURCE_DIRECTORY(Templates bsol_sources)
@@ -375,10 +375,10 @@
INSTALL_TARGETS(/lib bsol)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bsol ${bsol_sources})
TARGET_LINK_LIBRARIES(bsol vsol vgl_algo vgl vnl vbl)
-Index: vxl-1.17.0/contrib/brl/bbas/bsta/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bsta/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bsta/CMakeLists.txt 2012-06-01 15:44:01.149753576 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bsta/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+--- vxl.orig/contrib/brl/bbas/bsta/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bsta/CMakeLists.txt 2012-06-01 16:12:16.205730172 +0200
@@ -62,6 +62,7 @@
AUX_SOURCE_DIRECTORY(Templates bsta_sources)
@@ -387,10 +387,10 @@
INSTALL_TARGETS(/lib bsta)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/bsta ${bsta_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bsta/vis/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2012-06-01 15:44:01.153753576 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+--- vxl.orig/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2012-06-01 16:12:16.205730172 +0200
@@ -8,6 +8,9 @@
)
@@ -401,10 +401,10 @@
TARGET_LINK_LIBRARIES( bsta_vis bsta bsvg vnl )
-Index: vxl-1.17.0/contrib/brl/bbas/btol/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/btol/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/btol/CMakeLists.txt 2012-06-01 15:44:01.165753576 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/btol/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+--- vxl.orig/contrib/brl/bbas/btol/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/btol/CMakeLists.txt 2012-06-01 16:12:16.205730172 +0200
@@ -19,6 +19,7 @@
)
@@ -413,10 +413,10 @@
INSTALL_TARGETS(/lib btol)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/btol ${btol_sources})
-Index: vxl-1.17.0/contrib/brl/bbas/bugl/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bugl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bugl/CMakeLists.txt 2012-06-01 15:44:01.173753576 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bugl/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+--- vxl.orig/contrib/brl/bbas/bugl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bugl/CMakeLists.txt 2012-06-01 16:12:16.205730172 +0200
@@ -26,6 +26,7 @@
AUX_SOURCE_DIRECTORY(Templates bugl_sources)
@@ -425,10 +425,10 @@
INSTALL_TARGETS(/lib bugl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bugl ${bugl_sources})
TARGET_LINK_LIBRARIES(bugl vnl vgl_algo vgl vbl)
-Index: vxl-1.17.0/contrib/brl/bbas/bvgl/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bvgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-06-01 15:44:01.185753574 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+--- vxl.orig/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-06-01 16:12:16.209730172 +0200
@@ -38,6 +38,7 @@
#Create BVGL library
@@ -437,11 +437,11 @@
INSTALL_TARGETS(/lib bvgl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bvgl ${bvgl_sources})
TARGET_LINK_LIBRARIES(bvgl vsol vgl_algo vgl_io vgl vnl_algo vnl vil vbl)
-Index: vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bwm/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-06-01 15:44:01.205753574 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
-@@ -32,6 +32,9 @@
+--- vxl.orig/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-06-01 16:12:16.209730172 +0200
+@@ -31,6 +31,9 @@
ENDIF(ECW_FOUND)
ADD_LIBRARY(bwm_algo ${bwm_algo_sources})
@@ -449,12 +449,12 @@
+INSTALL_TARGETS(/lib bwm_algo)
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bwm/algo ${bwm_algo})
- TARGET_LINK_LIBRARIES( bwm_algo bwm 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 )
+ TARGET_LINK_LIBRARIES( bwm_algo sdet vtol vil vil_algo vgl vgl_algo vnl vnl_algo vsol vpgl vpgl_algo vpgl_file_formats bgui brip vdgl bsta vgui vul vcl shapelib )
-Index: vxl-1.17.0/contrib/brl/bbas/bxml/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bxml/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bxml/CMakeLists.txt 2012-06-01 15:44:01.217753575 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bxml/CMakeLists.txt 2012-06-01 15:44:08.977753468 +0200
+--- vxl.orig/contrib/brl/bbas/bxml/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bxml/CMakeLists.txt 2012-06-01 16:12:16.209730172 +0200
@@ -27,6 +27,9 @@
AUX_SOURCE_DIRECTORY(Templates bxml_sources)
@@ -465,10 +465,10 @@
TARGET_LINK_LIBRARIES( bxml vbl_io vul vbl )
IF(EXPAT_FOUND)
-Index: vxl-1.17.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/imesh/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2012-06-01 15:44:01.237753575 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+--- vxl.orig/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2012-06-01 16:12:16.209730172 +0200
@@ -23,6 +23,9 @@
ENDIF (NETLIB_FOUND)
@@ -479,25 +479,11 @@
IF(NETLIB_FOUND)
-Index: vxl-1.17.0/contrib/brl/bpro/core/brip_pro/CMakeLists.txt
+Index: vxl/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bpro/core/brip_pro/CMakeLists.txt 2012-06-01 15:44:01.285753574 +0200
-+++ vxl-1.17.0/contrib/brl/bpro/core/brip_pro/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+--- vxl.orig/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2012-06-01 16:12:16.209730172 +0200
@@ -14,6 +14,9 @@
- AUX_SOURCE_DIRECTORY(processes brip_pro_sources)
-
- ADD_LIBRARY(brip_pro ${brip_pro_sources})
-+SET_TARGET_PROPERTIES(brip_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
-+INSTALL_TARGETS(/lib brip_pro)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/brip_pro ${brip_pro_sources})
- TARGET_LINK_LIBRARIES(brip_pro bprb brdb brip vil_pro vil vsl)
-
- IF( BUILD_TESTING )
-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 2012-06-01 15:44:01.297753574 +0200
-+++ vxl-1.17.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
-@@ -14,6 +14,9 @@
AUX_SOURCE_DIRECTORY(processes bvgl_pro_sources)
ADD_LIBRARY(bvgl_pro ${bvgl_pro_sources})
@@ -507,10 +493,10 @@
TARGET_LINK_LIBRARIES(bvgl_pro bprb vil_pro bvgl vil vil_io)
-Index: vxl-1.17.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
+Index: vxl/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-06-01 15:44:01.329753572 +0200
-+++ vxl-1.17.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+--- vxl.orig/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-06-01 16:12:16.209730172 +0200
@@ -16,6 +16,9 @@
AUX_SOURCE_DIRECTORY(processes vil_pro_sources)
@@ -521,10 +507,10 @@
TARGET_LINK_LIBRARIES(vil_pro bbas_pro bprb bil bil_algo vil_algo vil_io vil vnl vul vsl)
-Index: vxl-1.17.0/contrib/brl/bseg/bmdl/CMakeLists.txt
+Index: vxl/contrib/brl/bseg/bmdl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/CMakeLists.txt 2012-06-01 15:44:01.361753573 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/bmdl/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+--- vxl.orig/contrib/brl/bseg/bmdl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bseg/bmdl/CMakeLists.txt 2012-06-01 16:12:16.209730172 +0200
@@ -16,6 +16,9 @@
AUX_SOURCE_DIRECTORY(Templates bmdl_sources)
@@ -535,10 +521,10 @@
TARGET_LINK_LIBRARIES(bmdl vil_algo imesh vgl_algo vgl vnl vil)
-Index: vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
+Index: vxl/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-06-01 15:44:01.369753573 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+--- vxl.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-06-01 16:12:16.209730172 +0200
@@ -31,6 +31,9 @@
AUX_SOURCE_DIRECTORY(processes bmdl_pro_sources)
@@ -549,10 +535,10 @@
TARGET_LINK_LIBRARIES(bmdl_pro bmdl bprb vil vil_io vpgl_file_formats vgl_io
vsol brip vpgl_pro vgl vul vpl imesh_algo minizip)
-Index: vxl-1.17.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+Index: vxl/contrib/brl/bseg/boxm/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-06-01 15:44:01.377753573 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+--- vxl.orig/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-06-01 16:12:16.209730172 +0200
@@ -20,6 +20,9 @@
)
@@ -563,10 +549,10 @@
IF( BUILD_TESTING )
SUBDIRS(tests)
-Index: vxl-1.17.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+Index: vxl/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-06-01 15:44:01.381753573 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+--- vxl.orig/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-06-01 16:12:16.209730172 +0200
@@ -19,6 +19,9 @@
AUX_SOURCE_DIRECTORY(processes boxm_algo_pro_sources)
@@ -577,10 +563,10 @@
TARGET_LINK_LIBRARIES(boxm_algo_pro boxm_algo boxm boxm_sample boxm_util boct bprb brdb bsta_pro vil_pro bsta vpgl_pro vpgl vpgl_algo vil vsol vgl brip vcl rply)
# Need bsta_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<bsta_histogram_base> >
-Index: vxl-1.17.0/contrib/brl/bseg/brip/CMakeLists.txt
+Index: vxl/contrib/brl/bseg/brip/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/brip/CMakeLists.txt 2012-06-01 15:44:01.409753571 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/brip/CMakeLists.txt 2012-06-01 15:44:08.981753468 +0200
+--- vxl.orig/contrib/brl/bseg/brip/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bseg/brip/CMakeLists.txt 2012-06-01 16:12:16.209730172 +0200
@@ -40,6 +40,7 @@
AUX_SOURCE_DIRECTORY(Templates brip_sources)
@@ -589,10 +575,10 @@
INSTALL_TARGETS(/lib brip)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/brip ${brip_sources})
-Index: vxl-1.17.0/contrib/brl/bseg/bvpl/CMakeLists.txt
+Index: vxl/contrib/brl/bseg/bvpl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/bvpl/CMakeLists.txt 2012-06-01 15:44:01.437753572 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/bvpl/CMakeLists.txt 2012-06-01 15:44:08.985753468 +0200
+--- vxl.orig/contrib/brl/bseg/bvpl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bseg/bvpl/CMakeLists.txt 2012-06-01 16:12:16.209730172 +0200
@@ -19,6 +19,9 @@
AUX_SOURCE_DIRECTORY(Templates bvpl_sources)
@@ -603,10 +589,10 @@
TARGET_LINK_LIBRARIES(bvpl bvpl_kernels bvpl_functors bvxm_grid bdgl bsta vnl vnl_io vil_algo vgl vpl vul vbl_io vsl vbl)
-Index: vxl-1.17.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
+Index: vxl/contrib/brl/bseg/bvxm/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2012-06-01 15:44:01.485753570 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2012-06-01 15:44:08.985753468 +0200
+--- vxl.orig/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -12,6 +12,9 @@
AUX_SOURCE_DIRECTORY(Templates bvxm_algo_sources)
@@ -617,10 +603,10 @@
TARGET_LINK_LIBRARIES( bvxm_algo bsta bvxm_grid_io boxm_util vnl vgl)
-Index: vxl-1.17.0/contrib/brl/bseg/sdet/CMakeLists.txt
+Index: vxl/contrib/brl/bseg/sdet/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/sdet/CMakeLists.txt 2012-06-01 15:44:01.513753571 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/sdet/CMakeLists.txt 2012-06-01 15:44:08.985753468 +0200
+--- vxl.orig/contrib/brl/bseg/sdet/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bseg/sdet/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -55,6 +55,7 @@
AUX_SOURCE_DIRECTORY(Templates sdet_sources)
@@ -629,10 +615,10 @@
INSTALL_TARGETS(/lib sdet)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/sdet ${sdet_sources})
-Index: vxl-1.17.0/contrib/brl/bseg/segv/CMakeLists.txt
+Index: vxl/contrib/brl/bseg/segv/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/segv/CMakeLists.txt 2012-06-01 15:44:01.521753571 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/segv/CMakeLists.txt 2012-06-01 15:44:08.985753468 +0200
+--- vxl.orig/contrib/brl/bseg/segv/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bseg/segv/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -33,6 +33,7 @@
)
@@ -641,10 +627,10 @@
INSTALL_TARGETS(/lib segv)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/segv ${segv_sources})
-Index: vxl-1.17.0/contrib/gel/geml/CMakeLists.txt
+Index: vxl/contrib/gel/geml/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/geml/CMakeLists.txt 2012-06-01 15:44:01.593753570 +0200
-+++ vxl-1.17.0/contrib/gel/geml/CMakeLists.txt 2012-06-01 15:44:08.985753468 +0200
+--- vxl.orig/contrib/gel/geml/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/geml/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -12,6 +12,7 @@
)
@@ -653,10 +639,10 @@
INSTALL_TARGETS(/lib geml)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/geml ${geml_sources})
TARGET_LINK_LIBRARIES(geml vil1 vnl)
-Index: vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt
+Index: vxl/contrib/gel/gevd/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gevd/CMakeLists.txt 2012-06-01 15:44:01.601753570 +0200
-+++ vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt 2012-06-01 15:44:08.985753468 +0200
+--- vxl.orig/contrib/gel/gevd/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/gevd/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -33,6 +33,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -665,10 +651,10 @@
INSTALL_TARGETS(/lib gevd)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gevd ${gevd_sources})
TARGET_LINK_LIBRARIES(gevd vtol vsol vdgl vil1 vil vnl vgl vbl vul)
-Index: vxl-1.17.0/contrib/gel/gkll/CMakeLists.txt
+Index: vxl/contrib/gel/gkll/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gkll/CMakeLists.txt 2012-06-01 15:44:01.609753570 +0200
-+++ vxl-1.17.0/contrib/gel/gkll/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+--- vxl.orig/contrib/gel/gkll/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/gkll/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -20,6 +20,7 @@
ENDIF(BUILD_OXL)
@@ -677,10 +663,10 @@
INSTALL_TARGETS(/lib gkll)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gkll ${gkll_sources})
-Index: vxl-1.17.0/contrib/gel/gmvl/CMakeLists.txt
+Index: vxl/contrib/gel/gmvl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gmvl/CMakeLists.txt 2012-06-01 15:44:01.617753568 +0200
-+++ vxl-1.17.0/contrib/gel/gmvl/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+--- vxl.orig/contrib/gel/gmvl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/gmvl/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -21,6 +21,7 @@
AUX_SOURCE_DIRECTORY(Templates gmvl_sources)
@@ -689,10 +675,10 @@
INSTALL_TARGETS(/lib gmvl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gmvl ${gmvl_sources})
TARGET_LINK_LIBRARIES(gmvl vtol vil1 vnl vbl vcl)
-Index: vxl-1.17.0/contrib/gel/gst/CMakeLists.txt
+Index: vxl/contrib/gel/gst/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gst/CMakeLists.txt 2012-06-01 15:44:01.621753568 +0200
-+++ vxl-1.17.0/contrib/gel/gst/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+--- vxl.orig/contrib/gel/gst/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/gst/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -17,6 +17,7 @@
AUX_SOURCE_DIRECTORY(Templates gst_sources)
@@ -701,10 +687,10 @@
INSTALL_TARGETS(/lib gst)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gst ${gst_sources})
-Index: vxl-1.17.0/contrib/gel/gtrl/CMakeLists.txt
+Index: vxl/contrib/gel/gtrl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/gtrl/CMakeLists.txt 2012-06-01 15:44:01.629753568 +0200
-+++ vxl-1.17.0/contrib/gel/gtrl/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+--- vxl.orig/contrib/gel/gtrl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/gtrl/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -25,6 +25,7 @@
ENDIF(NETLIB_FOUND)
@@ -713,10 +699,10 @@
INSTALL_TARGETS(/lib gtrl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gtrl ${gtrl_sources})
-Index: vxl-1.17.0/contrib/gel/vgel/CMakeLists.txt
+Index: vxl/contrib/gel/vgel/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vgel/CMakeLists.txt 2012-06-01 15:44:01.673753569 +0200
-+++ vxl-1.17.0/contrib/gel/vgel/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+--- vxl.orig/contrib/gel/vgel/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/vgel/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -20,6 +20,7 @@
ENDIF(BUILD_OXL)
@@ -725,10 +711,10 @@
INSTALL_TARGETS(/lib vgel)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vgel ${vgel_sources})
-Index: vxl-1.17.0/contrib/gel/vgel/kl/CMakeLists.txt
+Index: vxl/contrib/gel/vgel/kl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vgel/kl/CMakeLists.txt 2012-06-01 15:44:01.685753568 +0200
-+++ vxl-1.17.0/contrib/gel/vgel/kl/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+--- vxl.orig/contrib/gel/vgel/kl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/vgel/kl/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -15,6 +15,7 @@
)
@@ -737,10 +723,10 @@
INSTALL_TARGETS(/lib vgel_kl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vgel/kl ${vgel_kl_sources})
-Index: vxl-1.17.0/contrib/gel/vifa/CMakeLists.txt
+Index: vxl/contrib/gel/vifa/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vifa/CMakeLists.txt 2012-06-01 15:44:01.697753567 +0200
-+++ vxl-1.17.0/contrib/gel/vifa/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+--- vxl.orig/contrib/gel/vifa/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/vifa/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -31,6 +31,7 @@
AUX_SOURCE_DIRECTORY(Templates vifa_sources)
@@ -749,10 +735,10 @@
INSTALL_TARGETS(/lib vifa)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vifa ${vifa_sources})
TARGET_LINK_LIBRARIES(vifa gevd vtol vsol vdgl vnl vgl vbl vul vil vcl)
-Index: vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt
+Index: vxl/contrib/gel/vmal/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vmal/CMakeLists.txt 2012-06-01 15:44:01.705753567 +0200
-+++ vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+--- vxl.orig/contrib/gel/vmal/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/vmal/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -37,6 +37,7 @@
@@ -761,10 +747,10 @@
INSTALL_TARGETS(/lib vmal)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vmal ${vmal_sources})
-Index: vxl-1.17.0/contrib/gel/vsol/CMakeLists.txt
+Index: vxl/contrib/gel/vsol/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vsol/CMakeLists.txt 2012-06-01 15:44:01.713753567 +0200
-+++ vxl-1.17.0/contrib/gel/vsol/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+--- vxl.orig/contrib/gel/vsol/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/vsol/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -63,6 +63,7 @@
AUX_SOURCE_DIRECTORY(Templates vsol_sources)
@@ -773,10 +759,10 @@
INSTALL_TARGETS(/lib vsol)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vsol ${vsol_sources})
TARGET_LINK_LIBRARIES(vsol vgl_algo vgl_io vgl vnl vbl_io vbl vsl vul vcl)
-Index: vxl-1.17.0/contrib/gel/vsrl/CMakeLists.txt
+Index: vxl/contrib/gel/vsrl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/gel/vsrl/CMakeLists.txt 2012-06-01 15:44:01.729753568 +0200
-+++ vxl-1.17.0/contrib/gel/vsrl/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+--- vxl.orig/contrib/gel/vsrl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/gel/vsrl/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -60,6 +60,7 @@
ENDIF (HAS_VGUI)
@@ -785,10 +771,10 @@
INSTALL_TARGETS(/lib vsrl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vsrl ${vsrl_sources})
-Index: vxl-1.17.0/contrib/mul/ipts/CMakeLists.txt
+Index: vxl/contrib/mul/ipts/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/ipts/CMakeLists.txt 2012-06-01 15:44:00.837753579 +0200
-+++ vxl-1.17.0/contrib/mul/ipts/CMakeLists.txt 2012-06-01 15:44:08.989753468 +0200
+--- vxl.orig/contrib/mul/ipts/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/ipts/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -16,6 +16,7 @@
)
@@ -797,10 +783,10 @@
INSTALL_TARGETS(/lib ipts)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/ipts ${ipts_sources})
TARGET_LINK_LIBRARIES(ipts vimt_algo vimt vgl vil_algo vil)
-Index: vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt
+Index: vxl/contrib/mul/mbl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mbl/CMakeLists.txt 2012-06-01 15:44:00.845753579 +0200
-+++ vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/mul/mbl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/mbl/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -121,6 +121,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -809,10 +795,10 @@
TARGET_LINK_LIBRARIES(mbl vnl_io vnl_algo vgl_io vgl vbl_io vil_io vsl vnl vil vul vbl)
INSTALL_TARGETS(/lib mbl)
-Index: vxl-1.17.0/contrib/mul/mil/algo/CMakeLists.txt
+Index: vxl/contrib/mul/mil/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mil/algo/CMakeLists.txt 2012-06-01 15:44:00.865753580 +0200
-+++ vxl-1.17.0/contrib/mul/mil/algo/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/mul/mil/algo/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/mil/algo/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -15,6 +15,7 @@
AUX_SOURCE_DIRECTORY(Templates mil_algo_sources)
@@ -821,10 +807,10 @@
INSTALL_TARGETS(/lib mil_algo)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mil/algo ${mil_algo_sources})
TARGET_LINK_LIBRARIES(mil_algo mil mbl vnl vsl)
-Index: vxl-1.17.0/contrib/mul/mil/CMakeLists.txt
+Index: vxl/contrib/mul/mil/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mil/CMakeLists.txt 2012-06-01 15:44:00.873753580 +0200
-+++ vxl-1.17.0/contrib/mul/mil/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/mul/mil/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/mil/CMakeLists.txt 2012-06-01 16:12:16.213730172 +0200
@@ -37,6 +37,7 @@
AUX_SOURCE_DIRECTORY(Templates mil_sources)
@@ -833,10 +819,10 @@
INSTALL_TARGETS(/lib mil)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mil ${mil_sources})
TARGET_LINK_LIBRARIES(mil mbl vimt vnl vbl_io vgl vil1 vbl vsl)
-Index: vxl-1.17.0/contrib/mul/mil3d/CMakeLists.txt
+Index: vxl/contrib/mul/mil3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mil3d/CMakeLists.txt 2012-06-01 15:44:00.881753580 +0200
-+++ vxl-1.17.0/contrib/mul/mil3d/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/mul/mil3d/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/mil3d/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -20,6 +20,7 @@
AUX_SOURCE_DIRECTORY(Templates mil3d_sources)
@@ -845,10 +831,10 @@
INSTALL_TARGETS(/lib mil3d)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mil3d ${mil3d_sources})
TARGET_LINK_LIBRARIES(mil3d mil vbl_io vnl_io vnl vgl vbl vsl)
-Index: vxl-1.17.0/contrib/mul/mvl2/CMakeLists.txt
+Index: vxl/contrib/mul/mvl2/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/mvl2/CMakeLists.txt 2012-06-01 15:44:00.893753578 +0200
-+++ vxl-1.17.0/contrib/mul/mvl2/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/mul/mvl2/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/mvl2/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -52,6 +52,7 @@
ENDIF (AVIFILE_FOUND)
@@ -857,10 +843,10 @@
INSTALL_TARGETS(/lib mvl2)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/mvl2 ${mvl2_sources})
TARGET_LINK_LIBRARIES( mvl2 vil vul ${AVIFILE_LIBRARIES} )
-Index: vxl-1.17.0/contrib/mul/pdf1d/CMakeLists.txt
+Index: vxl/contrib/mul/pdf1d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/pdf1d/CMakeLists.txt 2012-06-01 15:44:00.897753578 +0200
-+++ vxl-1.17.0/contrib/mul/pdf1d/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/mul/pdf1d/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/pdf1d/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -49,6 +49,7 @@
AUX_SOURCE_DIRECTORY(Templates pdf1d_sources)
@@ -869,10 +855,10 @@
INSTALL_TARGETS(/lib pdf1d)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/pdf1d ${pdf1d_sources})
TARGET_LINK_LIBRARIES( pdf1d mbl vbl vnl_io vnl vsl )
-Index: vxl-1.17.0/contrib/mul/vil3d/algo/CMakeLists.txt
+Index: vxl/contrib/mul/vil3d/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vil3d/algo/CMakeLists.txt 2012-06-01 15:44:00.905753578 +0200
-+++ vxl-1.17.0/contrib/mul/vil3d/algo/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/mul/vil3d/algo/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/vil3d/algo/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -36,6 +36,7 @@
AUX_SOURCE_DIRECTORY(Templates vil3d_algo_sources)
@@ -881,10 +867,10 @@
INSTALL_TARGETS(/lib vil3d_algo)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vil3d/algo ${vil3d_algo_sources})
TARGET_LINK_LIBRARIES( vil3d_algo vil3d vil_algo vil vnl vgl )
-Index: vxl-1.17.0/contrib/mul/vil3d/CMakeLists.txt
+Index: vxl/contrib/mul/vil3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vil3d/CMakeLists.txt 2012-06-01 15:44:00.909753578 +0200
-+++ vxl-1.17.0/contrib/mul/vil3d/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/mul/vil3d/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/vil3d/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -49,6 +49,7 @@
AUX_SOURCE_DIRECTORY(Templates vil3d_sources)
@@ -893,10 +879,10 @@
TARGET_LINK_LIBRARIES( vil3d vil vul vsl vcl vnl )
INSTALL_TARGETS(/lib vil3d)
-Index: vxl-1.17.0/contrib/mul/vil3d/io/CMakeLists.txt
+Index: vxl/contrib/mul/vil3d/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vil3d/io/CMakeLists.txt 2012-06-01 15:44:00.917753578 +0200
-+++ vxl-1.17.0/contrib/mul/vil3d/io/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/mul/vil3d/io/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/vil3d/io/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -7,6 +7,7 @@
)
@@ -905,10 +891,10 @@
INSTALL_TARGETS(/lib vil3d_io)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vil3d/io ${vil3d_io_sources})
TARGET_LINK_LIBRARIES( vil3d_io vil3d vil_io )
-Index: vxl-1.17.0/contrib/mul/vimt/algo/CMakeLists.txt
+Index: vxl/contrib/mul/vimt/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vimt/algo/CMakeLists.txt 2012-06-01 15:44:00.929753579 +0200
-+++ vxl-1.17.0/contrib/mul/vimt/algo/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/mul/vimt/algo/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/vimt/algo/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -11,6 +11,7 @@
)
@@ -917,10 +903,10 @@
INSTALL_TARGETS(/lib vimt_algo)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt/algo ${vimt_algo_sources})
TARGET_LINK_LIBRARIES( vimt_algo vimt vil_algo vgl vcl )
-Index: vxl-1.17.0/contrib/mul/vimt/CMakeLists.txt
+Index: vxl/contrib/mul/vimt/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vimt/CMakeLists.txt 2012-06-01 15:44:00.937753579 +0200
-+++ vxl-1.17.0/contrib/mul/vimt/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/mul/vimt/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/vimt/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -35,6 +35,7 @@
AUX_SOURCE_DIRECTORY(Templates vimt_sources)
@@ -929,10 +915,10 @@
INSTALL_TARGETS(/lib vimt)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt ${vimt_sources})
TARGET_LINK_LIBRARIES(vimt mbl vil_algo vgl vnl vil_io vil )
-Index: vxl-1.17.0/contrib/mul/vimt3d/CMakeLists.txt
+Index: vxl/contrib/mul/vimt3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/mul/vimt3d/CMakeLists.txt 2012-06-01 15:44:00.953753579 +0200
-+++ vxl-1.17.0/contrib/mul/vimt3d/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/mul/vimt3d/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/mul/vimt3d/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -34,6 +34,7 @@
AUX_SOURCE_DIRECTORY(Templates vimt3d_sources)
@@ -941,10 +927,10 @@
INSTALL_TARGETS(/lib vimt3d)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/mul/vimt3d ${vimt3d_sources})
TARGET_LINK_LIBRARIES(vimt3d vil3d_algo vil3d_io vil3d vimt mbl vnl_algo vgl vnl_io vnl vil vsl vul)
-Index: vxl-1.17.0/contrib/oul/ouel/CMakeLists.txt
+Index: vxl/contrib/oul/ouel/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oul/ouel/CMakeLists.txt 2012-06-01 15:44:01.785753566 +0200
-+++ vxl-1.17.0/contrib/oul/ouel/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/oul/ouel/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/oul/ouel/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -11,6 +11,7 @@
)
@@ -953,10 +939,10 @@
INSTALL_TARGETS(/lib ouel)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul/ouel ${ouel_sources})
TARGET_LINK_LIBRARIES( ouel vnl_algo vnl )
-Index: vxl-1.17.0/contrib/oul/oufgl/CMakeLists.txt
+Index: vxl/contrib/oul/oufgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oul/oufgl/CMakeLists.txt 2012-06-01 15:44:01.797753567 +0200
-+++ vxl-1.17.0/contrib/oul/oufgl/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/oul/oufgl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/oul/oufgl/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -15,6 +15,7 @@
)
@@ -965,10 +951,10 @@
INSTALL_TARGETS(/lib oufgl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul/oufgl ${oufgl_sources})
TARGET_LINK_LIBRARIES( oufgl vil vil1 rt)
-Index: vxl-1.17.0/contrib/oul/ouml/CMakeLists.txt
+Index: vxl/contrib/oul/ouml/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oul/ouml/CMakeLists.txt 2012-06-01 15:44:01.809753567 +0200
-+++ vxl-1.17.0/contrib/oul/ouml/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/oul/ouml/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/oul/ouml/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -20,6 +20,7 @@
)
@@ -977,10 +963,10 @@
INSTALL_TARGETS(/lib ouml)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oul/ouml ${ouml_sources})
TARGET_LINK_LIBRARIES( ouml vgl vnl_algo vnl_io vnl vil1 vsl vpl )
-Index: vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt
+Index: vxl/contrib/oxl/osl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/oxl/osl/CMakeLists.txt 2012-06-01 15:44:01.745753568 +0200
-+++ vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt 2012-06-01 15:44:08.993753468 +0200
+--- vxl.orig/contrib/oxl/osl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/oxl/osl/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -45,6 +45,7 @@
AUX_SOURCE_DIRECTORY(Templates osl_sources)
@@ -989,10 +975,10 @@
INSTALL_TARGETS(/lib osl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/osl ${osl_sources})
TARGET_LINK_LIBRARIES(osl vnl_algo vnl vgl vil1 vbl)
-Index: vxl-1.17.0/contrib/prip/vmap/CMakeLists.txt
+Index: vxl/contrib/prip/vmap/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/prip/vmap/CMakeLists.txt 2012-06-01 15:44:00.985753577 +0200
-+++ vxl-1.17.0/contrib/prip/vmap/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+--- vxl.orig/contrib/prip/vmap/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/prip/vmap/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -28,6 +28,7 @@
)
@@ -1001,10 +987,10 @@
INSTALL_TARGETS(/lib vmap)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/prip/vmap ${vmap_sources})
TARGET_LINK_LIBRARIES(vmap vcl)
-Index: vxl-1.17.0/contrib/rpl/rgrl/CMakeLists.txt
+Index: vxl/contrib/rpl/rgrl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/rpl/rgrl/CMakeLists.txt 2012-06-01 15:44:00.789753581 +0200
-+++ vxl-1.17.0/contrib/rpl/rgrl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+--- vxl.orig/contrib/rpl/rgrl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/rpl/rgrl/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -161,6 +161,7 @@
AUX_SOURCE_DIRECTORY( Templates rgrl_sources )
@@ -1013,10 +999,10 @@
INSTALL_TARGETS(/lib rgrl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rgrl ${rgrl_sources})
TARGET_LINK_LIBRARIES( rgrl rrel rsdl vil3d vil vnl_algo vnl vbl vul)
-Index: vxl-1.17.0/contrib/rpl/rgtl/CMakeLists.txt
+Index: vxl/contrib/rpl/rgtl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/rpl/rgtl/CMakeLists.txt 2012-06-01 15:44:00.797753581 +0200
-+++ vxl-1.17.0/contrib/rpl/rgtl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+--- vxl.orig/contrib/rpl/rgtl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/rpl/rgtl/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -84,6 +84,7 @@
)
@@ -1025,10 +1011,10 @@
TARGET_LINK_LIBRARIES(rgtl vnl_algo vnl vcl)
INSTALL_TARGETS(/lib rgtl)
-Index: vxl-1.17.0/contrib/rpl/rtvl/CMakeLists.txt
+Index: vxl/contrib/rpl/rtvl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/rpl/rtvl/CMakeLists.txt 2012-06-01 15:44:00.813753580 +0200
-+++ vxl-1.17.0/contrib/rpl/rtvl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+--- vxl.orig/contrib/rpl/rtvl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/rpl/rtvl/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -41,6 +41,7 @@
)
@@ -1037,10 +1023,10 @@
TARGET_LINK_LIBRARIES(rtvl rgtl vnl_algo vnl)
INSTALL_TARGETS(/lib rtvl)
-Index: vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt
+Index: vxl/contrib/tbl/vepl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/tbl/vepl/CMakeLists.txt 2012-06-01 15:44:01.769753566 +0200
-+++ vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+--- vxl.orig/contrib/tbl/vepl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/tbl/vepl/CMakeLists.txt 2012-06-01 16:12:16.217730172 +0200
@@ -52,6 +52,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1049,10 +1035,10 @@
INSTALL_TARGETS(/lib vepl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vepl ${vepl_sources})
TARGET_LINK_LIBRARIES(vepl vipl vil ${CMAKE_THREAD_LIBS})
-Index: vxl-1.17.0/core/testlib/CMakeLists.txt
+Index: vxl/core/testlib/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/testlib/CMakeLists.txt 2012-06-01 15:44:01.881753566 +0200
-+++ vxl-1.17.0/core/testlib/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+--- vxl.orig/core/testlib/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/testlib/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -29,6 +29,7 @@
)
@@ -1061,10 +1047,10 @@
TARGET_LINK_LIBRARIES( testlib vcl )
INSTALL_TARGETS( /lib testlib)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/testlib ${testlib_sources})
-Index: vxl-1.17.0/core/vbl/CMakeLists.txt
+Index: vxl/core/vbl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vbl/CMakeLists.txt 2012-06-01 15:44:01.889753566 +0200
-+++ vxl-1.17.0/core/vbl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+--- vxl.orig/core/vbl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/core/vbl/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -42,6 +42,7 @@
AUX_SOURCE_DIRECTORY(Templates vbl_sources)
@@ -1073,10 +1059,10 @@
TARGET_LINK_LIBRARIES( vbl vcl )
INSTALL_TARGETS(/lib vbl)
-Index: vxl-1.17.0/core/vbl/io/CMakeLists.txt
+Index: vxl/core/vbl/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vbl/io/CMakeLists.txt 2012-06-01 15:44:01.897753566 +0200
-+++ vxl-1.17.0/core/vbl/io/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+--- vxl.orig/core/vbl/io/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/core/vbl/io/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -17,6 +17,7 @@
AUX_SOURCE_DIRECTORY(Templates vbl_io_sources)
@@ -1085,10 +1071,10 @@
TARGET_LINK_LIBRARIES( vbl_io vbl vsl )
INSTALL_TARGETS(/lib vbl_io)
-Index: vxl-1.17.0/core/vcsl/CMakeLists.txt
+Index: vxl/core/vcsl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vcsl/CMakeLists.txt 2012-06-01 15:44:01.909753564 +0200
-+++ vxl-1.17.0/core/vcsl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+--- vxl.orig/core/vcsl/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vcsl/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -63,6 +63,7 @@
AUX_SOURCE_DIRECTORY( Templates vcsl_sources )
@@ -1097,10 +1083,10 @@
TARGET_LINK_LIBRARIES( vcsl vnl vbl )
INSTALL_TARGETS(/lib vcsl)
-Index: vxl-1.17.0/core/vgl/CMakeLists.txt
+Index: vxl/core/vgl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgl/CMakeLists.txt 2012-06-01 15:44:01.829753566 +0200
-+++ vxl-1.17.0/core/vgl/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+--- vxl.orig/core/vgl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/core/vgl/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -69,6 +69,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_sources)
@@ -1109,10 +1095,10 @@
TARGET_LINK_LIBRARIES( vgl vcl )
doxygen_add_library(core/vgl
#DEPENDS core/vsl core/vnl
-Index: vxl-1.17.0/core/vgl/io/CMakeLists.txt
+Index: vxl/core/vgl/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgl/io/CMakeLists.txt 2012-06-01 15:44:01.841753565 +0200
-+++ vxl-1.17.0/core/vgl/io/CMakeLists.txt 2012-06-01 15:44:08.997753468 +0200
+--- vxl.orig/core/vgl/io/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/core/vgl/io/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -29,6 +29,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_io_sources)
@@ -1121,10 +1107,10 @@
TARGET_LINK_LIBRARIES( vgl_io vgl vsl )
INSTALL_TARGETS(/lib vgl_io)
-Index: vxl-1.17.0/core/vgui/CMakeLists.txt
+Index: vxl/core/vgui/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgui/CMakeLists.txt 2012-06-01 15:44:01.917753564 +0200
-+++ vxl-1.17.0/core/vgui/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vgui/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vgui/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -518,6 +518,7 @@
)
@@ -1133,10 +1119,10 @@
INSTALL_TARGETS(/lib vgui)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vgui ${vgui_sources})
SET( VGUI_FOUND "YES" CACHE INTERNAL "Was vgui successfully built?" )
-Index: vxl-1.17.0/core/vgui/wx/CMakeLists.txt
+Index: vxl/core/vgui/wx/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vgui/wx/CMakeLists.txt 2012-06-01 15:44:01.929753564 +0200
-+++ vxl-1.17.0/core/vgui/wx/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vgui/wx/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vgui/wx/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -24,6 +24,7 @@
)
@@ -1145,10 +1131,10 @@
TARGET_LINK_LIBRARIES(vgui_wx vgui ${wxWidgets_LIBRARIES})
IF (BUILD_TESTING)
-Index: vxl-1.17.0/core/vidl/CMakeLists.txt
+Index: vxl/core/vidl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vidl/CMakeLists.txt 2012-06-01 15:44:01.937753565 +0200
-+++ vxl-1.17.0/core/vidl/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vidl/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vidl/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -128,6 +128,7 @@
AUX_SOURCE_DIRECTORY(Templates vidl_sources)
@@ -1157,10 +1143,10 @@
INSTALL_TARGETS(/lib vidl)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl ${vidl_sources})
-Index: vxl-1.17.0/core/vidl/gui/CMakeLists.txt
+Index: vxl/core/vidl/gui/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vidl/gui/CMakeLists.txt 2012-06-01 15:44:01.945753565 +0200
-+++ vxl-1.17.0/core/vidl/gui/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vidl/gui/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vidl/gui/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -12,6 +12,7 @@
)
@@ -1169,10 +1155,10 @@
INSTALL_TARGETS(/lib vidl_gui)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl/gui ${vidl_gui_sources})
TARGET_LINK_LIBRARIES( vidl_gui vidl vgui vil )
-Index: vxl-1.17.0/core/vil/algo/CMakeLists.txt
+Index: vxl/core/vil/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil/algo/CMakeLists.txt 2012-06-01 15:44:01.961753565 +0200
-+++ vxl-1.17.0/core/vil/algo/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vil/algo/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vil/algo/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -57,6 +57,7 @@
AUX_SOURCE_DIRECTORY(Templates vil_algo_sources)
@@ -1181,10 +1167,10 @@
TARGET_LINK_LIBRARIES( vil_algo vil vnl_algo vnl vcl )
-Index: vxl-1.17.0/core/vil/CMakeLists.txt
+Index: vxl/core/vil/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil/CMakeLists.txt 2012-06-01 15:44:01.969753565 +0200
-+++ vxl-1.17.0/core/vil/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vil/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/core/vil/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -340,6 +340,7 @@
TARGET_LINK_LIBRARIES( vil nsl vil_network socket )
ENDIF (SOLARIS)
@@ -1193,10 +1179,10 @@
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil
${vil_sources}
${vil_network_sources}
-Index: vxl-1.17.0/core/vil/io/CMakeLists.txt
+Index: vxl/core/vil/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil/io/CMakeLists.txt 2012-06-01 15:44:01.977753563 +0200
-+++ vxl-1.17.0/core/vil/io/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vil/io/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vil/io/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -15,6 +15,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1205,10 +1191,10 @@
TARGET_LINK_LIBRARIES( vil_io vil vsl )
INSTALL_TARGETS(/lib vil_io)
-Index: vxl-1.17.0/core/vil1/CMakeLists.txt
+Index: vxl/core/vil1/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil1/CMakeLists.txt 2012-06-01 15:44:01.985753563 +0200
-+++ vxl-1.17.0/core/vil1/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vil1/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vil1/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -169,6 +169,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1217,10 +1203,10 @@
INSTALL_TARGETS(/lib vil1)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1 ${vil1_sources})
-Index: vxl-1.17.0/core/vil1/io/CMakeLists.txt
+Index: vxl/core/vil1/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vil1/io/CMakeLists.txt 2012-06-01 15:44:01.997753563 +0200
-+++ vxl-1.17.0/core/vil1/io/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vil1/io/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vil1/io/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -15,6 +15,7 @@
AUX_SOURCE_DIRECTORY(Templates vil1_io_sources)
@@ -1229,10 +1215,10 @@
TARGET_LINK_LIBRARIES( vil1_io vil1 vsl )
INSTALL_TARGETS(/lib vil1_io)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1/io ${vil1_io_sources})
-Index: vxl-1.17.0/core/vnl/algo/CMakeLists.txt
+Index: vxl/core/vnl/algo/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vnl/algo/CMakeLists.txt 2012-06-01 15:44:02.009753564 +0200
-+++ vxl-1.17.0/core/vnl/algo/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vnl/algo/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vnl/algo/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -102,6 +102,7 @@
AUX_SOURCE_DIRECTORY(Templates vnl_algo_sources)
@@ -1241,10 +1227,10 @@
TARGET_LINK_LIBRARIES( vnl_algo ${NETLIB_LIBRARIES} vnl )
INSTALL_TARGETS(/lib vnl_algo)
-Index: vxl-1.17.0/core/vnl/CMakeLists.txt
+Index: vxl/core/vnl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vnl/CMakeLists.txt 2012-06-01 15:44:02.021753564 +0200
-+++ vxl-1.17.0/core/vnl/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vnl/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vnl/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -264,6 +264,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1253,10 +1239,10 @@
TARGET_LINK_LIBRARIES( vnl vcl )
INSTALL_TARGETS(/lib vnl)
-Index: vxl-1.17.0/core/vnl/io/CMakeLists.txt
+Index: vxl/core/vnl/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vnl/io/CMakeLists.txt 2012-06-01 15:44:02.029753564 +0200
-+++ vxl-1.17.0/core/vnl/io/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vnl/io/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vnl/io/CMakeLists.txt 2012-06-01 16:12:16.221730172 +0200
@@ -26,6 +26,7 @@
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -1265,10 +1251,10 @@
TARGET_LINK_LIBRARIES( vnl_io vnl vsl )
INSTALL_TARGETS(/lib vnl_io)
-Index: vxl-1.17.0/core/vnl/xio/CMakeLists.txt
+Index: vxl/core/vnl/xio/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vnl/xio/CMakeLists.txt 2012-06-01 15:44:02.041753564 +0200
-+++ vxl-1.17.0/core/vnl/xio/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vnl/xio/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vnl/xio/CMakeLists.txt 2012-06-01 16:12:16.225730172 +0200
@@ -11,6 +11,7 @@
AUX_SOURCE_DIRECTORY(Templates vnl_xio_sources)
@@ -1277,10 +1263,10 @@
TARGET_LINK_LIBRARIES( vnl_xio vnl vsl )
INSTALL_TARGETS(/lib vnl_xio)
-Index: vxl-1.17.0/core/vpdl/CMakeLists.txt
+Index: vxl/core/vpdl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vpdl/CMakeLists.txt 2012-06-01 15:44:02.053753562 +0200
-+++ vxl-1.17.0/core/vpdl/CMakeLists.txt 2012-06-01 15:44:09.001753467 +0200
+--- vxl.orig/core/vpdl/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vpdl/CMakeLists.txt 2012-06-01 16:12:16.225730172 +0200
@@ -48,6 +48,7 @@
AUX_SOURCE_DIRECTORY(Templates vpdl_sources)
@@ -1289,10 +1275,10 @@
TARGET_LINK_LIBRARIES( vpdl vnl_algo vnl )
INSTALL_TARGETS(/lib vpdl)
-Index: vxl-1.17.0/core/vsl/CMakeLists.txt
+Index: vxl/core/vsl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vsl/CMakeLists.txt 2012-06-01 15:44:02.073753562 +0200
-+++ vxl-1.17.0/core/vsl/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+--- vxl.orig/core/vsl/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vsl/CMakeLists.txt 2012-06-01 16:12:16.225730172 +0200
@@ -36,6 +36,7 @@
AUX_SOURCE_DIRECTORY(Templates vsl_sources)
@@ -1301,10 +1287,10 @@
TARGET_LINK_LIBRARIES( vsl vcl )
INSTALL_TARGETS(/lib vsl)
-Index: vxl-1.17.0/core/vul/io/CMakeLists.txt
+Index: vxl/core/vul/io/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/core/vul/io/CMakeLists.txt 2012-06-01 15:44:01.873753566 +0200
-+++ vxl-1.17.0/core/vul/io/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+--- vxl.orig/core/vul/io/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/core/vul/io/CMakeLists.txt 2012-06-01 16:12:16.225730172 +0200
@@ -5,6 +5,7 @@
)
@@ -1313,10 +1299,10 @@
TARGET_LINK_LIBRARIES(vul_io vul vsl)
INSTALL_TARGETS(/lib vul_io)
-Index: vxl-1.17.0/v3p/dcmtk/CMakeLists.txt
+Index: vxl/v3p/dcmtk/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/v3p/dcmtk/CMakeLists.txt 2012-06-01 15:44:00.757753580 +0200
-+++ vxl-1.17.0/v3p/dcmtk/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+--- vxl.orig/v3p/dcmtk/CMakeLists.txt 2012-06-01 16:11:14.000000000 +0200
++++ vxl/v3p/dcmtk/CMakeLists.txt 2012-06-01 16:12:16.225730172 +0200
@@ -453,6 +453,7 @@
TARGET_LINK_LIBRARIES( dcmtk ${ZLIB_LIBRARIES} )
ENDIF( DCMTK_HAVE_ZLIB )
@@ -1325,10 +1311,10 @@
INSTALL_TARGETS( /lib dcmtk )
IF( BUILD_TESTING )
-Index: vxl-1.17.0/vcl/CMakeLists.txt
+Index: vxl/vcl/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/vcl/CMakeLists.txt 2012-06-01 15:44:02.085753563 +0200
-+++ vxl-1.17.0/vcl/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+--- vxl.orig/vcl/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/vcl/CMakeLists.txt 2012-06-01 16:12:16.225730172 +0200
@@ -360,6 +360,7 @@
#AUX_SOURCE_DIRECTORY(Templates vcl_sources)
@@ -1337,10 +1323,10 @@
# CMake can automatically figure out the compiler characteristics on
# Windows too. No need to do manual config.
-Index: vxl-1.17.0/contrib/brl/b3p/expatpp/CMakeLists.txt
+Index: vxl/contrib/brl/b3p/expatpp/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/b3p/expatpp/CMakeLists.txt 2012-06-01 15:44:01.277753573 +0200
-+++ vxl-1.17.0/contrib/brl/b3p/expatpp/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+--- vxl.orig/contrib/brl/b3p/expatpp/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/b3p/expatpp/CMakeLists.txt 2012-06-01 16:12:16.225730172 +0200
@@ -12,6 +12,9 @@
SET( expatpp_sources expatpp.h expatpp.cpp expatpplib.h )
@@ -1351,10 +1337,10 @@
TARGET_LINK_LIBRARIES( expatpp ${EXPAT_LIBRARIES} )
IF( BUILD_TESTING )
-Index: vxl-1.17.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-06-01 15:44:01.229753575 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+--- vxl.orig/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-06-01 16:12:16.225730172 +0200
@@ -12,7 +12,9 @@
AUX_SOURCE_DIRECTORY(Templates bsvg_sources)
@@ -1366,10 +1352,10 @@
TARGET_LINK_LIBRARIES( bsvg bxml )
IF( BUILD_TESTING )
-Index: vxl-1.17.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/bmsh3d/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2012-06-01 15:44:01.105753576 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+--- vxl.orig/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2012-06-01 16:12:16.225730172 +0200
@@ -32,7 +32,9 @@
)
@@ -1381,10 +1367,10 @@
TARGET_LINK_LIBRARIES( bmsh3d vgl vgl_algo vnl vul)
SUBDIRS( algo )
-Index: vxl-1.17.0/contrib/brl/bpro/bprb/CMakeLists.txt
+Index: vxl/contrib/brl/bpro/bprb/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bpro/bprb/CMakeLists.txt 2012-06-01 15:44:01.353753572 +0200
-+++ vxl-1.17.0/contrib/brl/bpro/bprb/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+--- vxl.orig/contrib/brl/bpro/bprb/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bpro/bprb/CMakeLists.txt 2012-06-01 16:12:16.225730172 +0200
@@ -18,7 +18,9 @@
AUX_SOURCE_DIRECTORY(Templates bprb_sources)
@@ -1396,10 +1382,10 @@
TARGET_LINK_LIBRARIES(bprb brdb bxml vbl vsl)
IF(BUILD_TESTING)
-Index: vxl-1.17.0/contrib/brl/bbas/brdb/CMakeLists.txt
+Index: vxl/contrib/brl/bbas/brdb/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bbas/brdb/CMakeLists.txt 2012-06-01 15:44:01.257753573 +0200
-+++ vxl-1.17.0/contrib/brl/bbas/brdb/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+--- vxl.orig/contrib/brl/bbas/brdb/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bbas/brdb/CMakeLists.txt 2012-06-01 16:12:16.225730172 +0200
@@ -15,7 +15,9 @@
AUX_SOURCE_DIRECTORY(Templates brdb_sources)
@@ -1411,10 +1397,10 @@
# brdb should not depend on any library that uses it
TARGET_LINK_LIBRARIES(brdb vbl_io vbl vsl)
-Index: vxl-1.17.0/contrib/brl/bseg/boct/CMakeLists.txt
+Index: vxl/contrib/brl/bseg/boct/CMakeLists.txt
===================================================================
---- vxl-1.17.0.orig/contrib/brl/bseg/boct/CMakeLists.txt 2012-06-01 15:44:01.545753569 +0200
-+++ vxl-1.17.0/contrib/brl/bseg/boct/CMakeLists.txt 2012-06-01 15:44:09.005753466 +0200
+--- vxl.orig/contrib/brl/bseg/boct/CMakeLists.txt 2012-06-01 16:11:13.000000000 +0200
++++ vxl/contrib/brl/bseg/boct/CMakeLists.txt 2012-06-01 16:12:16.225730172 +0200
@@ -14,7 +14,9 @@
AUX_SOURCE_DIRECTORY(Templates boct_sources)
More information about the debian-med-commit
mailing list