[med-svn] r12712 - in trunk/packages/vxl/trunk/debian: . patches
Mathieu Malaterre
malat at alioth.debian.org
Fri Dec 28 18:06:53 UTC 2012
Author: malat
Date: 2012-12-28 18:06:53 +0000 (Fri, 28 Dec 2012)
New Revision: 12712
Modified:
trunk/packages/vxl/trunk/debian/changelog
trunk/packages/vxl/trunk/debian/control
trunk/packages/vxl/trunk/debian/patches/fixingupstream.patch
Log:
Fix patch
Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog 2012-12-22 09:47:15 UTC (rev 12711)
+++ trunk/packages/vxl/trunk/debian/changelog 2012-12-28 18:06:53 UTC (rev 12712)
@@ -1,4 +1,4 @@
-vxl (1.17.0-1) UNRELEASED; urgency=low
+vxl (1.17.0-1) experimental; urgency=low
* New upstream
Modified: trunk/packages/vxl/trunk/debian/control
===================================================================
--- trunk/packages/vxl/trunk/debian/control 2012-12-22 09:47:15 UTC (rev 12711)
+++ trunk/packages/vxl/trunk/debian/control 2012-12-28 18:06:53 UTC (rev 12712)
@@ -9,7 +9,7 @@
Build-Depends: debhelper (>= 9), cmake (>= 2.4.5), libtiff5-dev | libtiff-dev,
libdcmtk2-dev, libpng-dev, libjpeg-dev, zlib1g-dev, libexpat-dev, python-dev (>= 2.6.6-3~),
libgeotiff-dev, libcoin60-dev, libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libqt4-dev, libxerces-c-dev, libglu-dev, libqt4-opengl-dev,
+ libqt4-dev, libxerces-c-dev, libglu-dev, libqt4-opengl-dev, libshp-dev,
libmpeg2-4-dev, libswscale-dev, libavformat-dev, libavcodec-dev
Standards-Version: 3.9.3
X-Python-Version: 2.7
Modified: trunk/packages/vxl/trunk/debian/patches/fixingupstream.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/fixingupstream.patch 2012-12-22 09:47:15 UTC (rev 12711)
+++ trunk/packages/vxl/trunk/debian/patches/fixingupstream.patch 2012-12-28 18:06:53 UTC (rev 12712)
@@ -23,9 +23,11 @@
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
---- vxl-1.17.0.orig/core/vpgl/CMakeLists.txt
-+++ vxl-1.17.0/core/vpgl/CMakeLists.txt
-@@ -32,6 +32,7 @@ SET( vpgl_sources
+Index: vxl-1.17.0/core/vpgl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vpgl/CMakeLists.txt 2011-11-17 17:54:51.000000000 +0100
++++ vxl-1.17.0/core/vpgl/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -32,6 +32,7 @@
AUX_SOURCE_DIRECTORY(Templates vpgl_sources)
ADD_LIBRARY(vpgl ${vpgl_sources})
@@ -33,9 +35,11 @@
TARGET_LINK_LIBRARIES(vpgl vnl_algo vnl vgl_algo vgl vul vsl vbl)
IF( BUILD_TESTING )
---- vxl-1.17.0.orig/core/vpgl/io/CMakeLists.txt
-+++ vxl-1.17.0/core/vpgl/io/CMakeLists.txt
-@@ -13,7 +13,7 @@ SET(vpgl_io_sources
+Index: vxl-1.17.0/core/vpgl/io/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vpgl/io/CMakeLists.txt 2011-11-17 13:06:36.000000000 +0100
++++ vxl-1.17.0/core/vpgl/io/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -13,7 +13,7 @@
AUX_SOURCE_DIRECTORY(Templates vpgl_io_sources)
ADD_LIBRARY(vpgl_io ${vpgl_io_sources})
@@ -44,9 +48,11 @@
TARGET_LINK_LIBRARIES(vpgl_io vsl vpgl vnl vgl vgl_algo vgl_io vnl_io vbl_io)
INSTALL_TARGETS(/lib vpgl_io)
---- vxl-1.17.0.orig/core/vpgl/file_formats/CMakeLists.txt
-+++ vxl-1.17.0/core/vpgl/file_formats/CMakeLists.txt
-@@ -21,7 +21,7 @@ IF(TIFF_FOUND)
+Index: vxl-1.17.0/core/vpgl/file_formats/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vpgl/file_formats/CMakeLists.txt 2012-06-08 19:25:07.000000000 +0200
++++ vxl-1.17.0/core/vpgl/file_formats/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -21,7 +21,7 @@
ENDIF(TIFF_FOUND)
ADD_LIBRARY(vpgl_file_formats ${vpgl_file_formats_sources})
@@ -55,14 +61,15 @@
TARGET_LINK_LIBRARIES(vpgl_file_formats vpgl vil vnl)
IF( BUILD_TESTING )
---- vxl-1.17.0.orig/core/vpgl/algo/CMakeLists.txt
-+++ vxl-1.17.0/core/vpgl/algo/CMakeLists.txt
-@@ -29,10 +29,10 @@ SET( vpgl_algo_sources
+Index: vxl-1.17.0/core/vpgl/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vpgl/algo/CMakeLists.txt 2011-11-17 19:17:04.000000000 +0100
++++ vxl-1.17.0/core/vpgl/algo/CMakeLists.txt 2012-12-28 19:02:49.099216263 +0100
+@@ -29,10 +29,9 @@
AUX_SOURCE_DIRECTORY(Templates vpgl_algo_sources)
ADD_LIBRARY(vpgl_algo ${vpgl_algo_sources})
-
-+message(${V3P_NETLIB_LIBRARY_PROPERTIES})
+SET_TARGET_PROPERTIES(vpgl_algo PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
TARGET_LINK_LIBRARIES(vpgl_algo vpgl vpgl_file_formats vgl_algo vnl_algo vnl vgl vil vul vbl)
@@ -70,9 +77,11 @@
IF( BUILD_TESTING )
SUBDIRS(tests)
ENDIF( BUILD_TESTING )
---- vxl-1.17.0.orig/core/vpgl/xio/CMakeLists.txt
-+++ vxl-1.17.0/core/vpgl/xio/CMakeLists.txt
-@@ -6,6 +6,7 @@ SET(vpgl_xio_sources
+Index: vxl-1.17.0/core/vpgl/xio/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vpgl/xio/CMakeLists.txt 2011-11-17 17:54:51.000000000 +0100
++++ vxl-1.17.0/core/vpgl/xio/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -6,6 +6,7 @@
ADD_LIBRARY(vpgl_xio ${vpgl_xio_sources} )
TARGET_LINK_LIBRARIES( vpgl_xio vpgl vsl )
@@ -80,9 +89,11 @@
INSTALL_TARGETS(/lib vpgl_xio)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vpgl/xio ${vpgl_xio_sources})
---- vxl-1.17.0.orig/core/vgl/xio/CMakeLists.txt
-+++ vxl-1.17.0/core/vgl/xio/CMakeLists.txt
-@@ -10,6 +10,7 @@ SET(vgl_xio_sources
+Index: vxl-1.17.0/core/vgl/xio/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vgl/xio/CMakeLists.txt 2011-07-29 16:09:36.000000000 +0200
++++ vxl-1.17.0/core/vgl/xio/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -10,6 +10,7 @@
AUX_SOURCE_DIRECTORY(Templates vgl_xio_sources)
ADD_LIBRARY(vgl_xio ${vgl_xio_sources})
@@ -90,9 +101,11 @@
IF(NOT WIN32)
SET_TARGET_PROPERTIES(vgl_xio PROPERTIES COMPILE_FLAGS "-fPIC")
ENDIF(NOT WIN32)
---- vxl-1.17.0.orig/core/vpl/CMakeLists.txt
-+++ vxl-1.17.0/core/vpl/CMakeLists.txt
-@@ -13,6 +13,7 @@ SET( vpl_sources
+Index: vxl-1.17.0/core/vpl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/core/vpl/CMakeLists.txt 2012-06-20 17:28:19.000000000 +0200
++++ vxl-1.17.0/core/vpl/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -13,6 +13,7 @@
)
ADD_LIBRARY(vpl ${vpl_sources})
@@ -100,9 +113,11 @@
IF(NOT WIN32)
SET_TARGET_PROPERTIES(vpl PROPERTIES COMPILE_FLAGS "-fPIC")
ENDIF(NOT WIN32)
---- vxl-1.17.0.orig/contrib/rpl/rrel/CMakeLists.txt
-+++ vxl-1.17.0/contrib/rpl/rrel/CMakeLists.txt
-@@ -44,6 +44,7 @@ SET(rrel_sources
+Index: vxl-1.17.0/contrib/rpl/rrel/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/rpl/rrel/CMakeLists.txt 2011-09-27 19:45:43.000000000 +0200
++++ vxl-1.17.0/contrib/rpl/rrel/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -44,6 +44,7 @@
AUX_SOURCE_DIRECTORY(Templates rrel_sources)
ADD_LIBRARY(rrel ${rrel_sources})
@@ -110,9 +125,11 @@
INSTALL_TARGETS(/lib rrel)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rrel ${rrel_sources})
---- vxl-1.17.0.orig/contrib/brl/bseg/bvxm/grid/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/bvxm/grid/CMakeLists.txt
-@@ -27,7 +27,9 @@ SET(bvxm_grid_sources
+Index: vxl-1.17.0/contrib/brl/bseg/bvxm/grid/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/bvxm/grid/CMakeLists.txt 2011-11-27 17:23:26.000000000 +0100
++++ vxl-1.17.0/contrib/brl/bseg/bvxm/grid/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -27,7 +27,9 @@
AUX_SOURCE_DIRECTORY(Templates bvxm_grid_sources)
ADD_LIBRARY( bvxm_grid ${bvxm_grid_sources})
@@ -123,86 +140,11 @@
TARGET_LINK_LIBRARIES( bvxm_grid vpgl vnl vil vil_algo vul vbl vsl vgl vgl_algo vil3d vil3d_algo)
SUBDIRS( io )
---- /dev/null
-+++ vxl-1.17.0/contrib/brl/bseg/boxm2/,
-@@ -0,0 +1,74 @@
-+# contrib/brl/bseg/boxm2/CMakeLists.txt
-+doxygen_add_book(contrib/brl/bseg/boxm2 "BOXM2 overview documentation")
-+doxygen_add_package(contrib/brl/bseg/boxm2 "BOXM2 Library")
-+
-+INCLUDE_DIRECTORIES( ${GEL_INCLUDE_DIR} )
-+INCLUDE_DIRECTORIES( ${GEL_INCLUDE_DIR}/mrc )
-+INCLUDE_DIRECTORIES( ${BRL_INCLUDE_DIR}/bbas )
-+
-+SET(boxm2_sources
-+ boxm2_block.h boxm2_block.cxx
-+ boxm2_block_metadata.h boxm2_block_metadata.cxx
-+ boxm2_data_base.h boxm2_data_base.cxx
-+ boxm2_data.h boxm2_data.txx
-+ boxm2_data_traits.h
-+ boxm2_util.h boxm2_util.cxx
-+ boxm2_normal_albedo_array.h boxm2_normal_albedo_array.cxx
-+ )
-+
-+INCLUDE( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+IF(EXPAT_FOUND)
-+
-+ INCLUDE_DIRECTORIES( ${EXPAT_INCLUDE_DIR} )
-+ INCLUDE_DIRECTORIES( ${BRL_INCLUDE_DIR}/b3p/expatpp )
-+
-+ SET(boxm2_sources ${boxm2_sources}
-+ boxm2_scene.h boxm2_scene.cxx
-+ boxm2_scene_parser.h boxm2_scene_parser.cxx
-+ )
-+
-+ENDIF(EXPAT_FOUND)
-+
-+AUX_SOURCE_DIRECTORY(Templates boxm2_sources)
-+
-+ADD_LIBRARY(boxm2 ${boxm2_sources})
-+TARGET_LINK_LIBRARIES(boxm2 boxm2_basic boct brdb bsta vsph vbl_io vpgl vpgl_pro vpgl_io vpgl_xio vpgl_algo vgl_xio vgl vnl_algo vnl vbl vil vul vsl vcl)
-+IF(EXPAT_FOUND)
-+TARGET_LINK_LIBRARIES(boxm2 expatpp)
-+ENDIF(EXPAT_FOUND)
-+
-+#basic
-+subdirs(basic)
-+
-+#io
-+subdirs(io)
-+
-+#c plus plus library
-+subdirs(cpp)
-+
-+#opencl accelerated library
-+subdirs(ocl)
-+
-+#reg lib
-+subdirs(class)
-+
-+#registration Library
-+subdirs(reg)
-+
-+#pro
-+subdirs(pro)
-+
-+#tableaus
-+subdirs(view)
-+
-+#util
-+subdirs(util)
-+
-+#tests
-+IF( BUILD_TESTING )
-+ SUBDIRS(tests)
-+ENDIF( BUILD_TESTING )
-+
-+#install the .h .txx and libs
-+INSTALL_TARGETS(/lib boxm2)
-+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boxm2/ ${boxm2_sources})
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm2/CMakeLists.txt
-@@ -32,6 +32,7 @@ ENDIF(EXPAT_FOUND)
+Index: vxl-1.17.0/contrib/brl/bseg/boxm2/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/CMakeLists.txt 2012-05-04 17:54:59.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm2/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -32,6 +32,7 @@
AUX_SOURCE_DIRECTORY(Templates boxm2_sources)
ADD_LIBRARY(boxm2 ${boxm2_sources})
@@ -210,9 +152,11 @@
TARGET_LINK_LIBRARIES(boxm2 boxm2_basic boct brdb bsta vsph vbl_io vpgl vpgl_pro vpgl_io vpgl_xio vpgl_algo vgl_xio vgl vnl_algo vnl vbl vil vul vsl vcl)
IF(EXPAT_FOUND)
TARGET_LINK_LIBRARIES(boxm2 expatpp)
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/io/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm2/io/CMakeLists.txt
-@@ -20,6 +20,7 @@ AUX_SOURCE_DIRECTORY(Templates boxm2_io_
+Index: vxl-1.17.0/contrib/brl/bseg/boxm2/io/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/io/CMakeLists.txt 2012-02-29 14:31:05.000000000 +0100
++++ vxl-1.17.0/contrib/brl/bseg/boxm2/io/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -20,6 +20,7 @@
ADD_LIBRARY(boxm2_io ${boxm2_io_sources})
TARGET_LINK_LIBRARIES(boxm2_io boxm2 expatpp vpgl baio vpgl vgl_xio vgl vbl vul vsl vcl)
@@ -220,9 +164,11 @@
#install the .h .txx and libs
INSTALL_TARGETS(/lib boxm2_io)
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/basic/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm2/basic/CMakeLists.txt
-@@ -15,6 +15,7 @@ SET(boxm2_basic_sources
+Index: vxl-1.17.0/contrib/brl/bseg/boxm2/basic/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/basic/CMakeLists.txt 2011-10-02 21:38:34.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm2/basic/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -15,6 +15,7 @@
AUX_SOURCE_DIRECTORY(Templates boxm2_basic_sources)
ADD_LIBRARY(boxm2_basic ${boxm2_basic_sources})
@@ -230,21 +176,25 @@
TARGET_LINK_LIBRARIES(boxm2_basic brdb baio expatpp vpgl vgl_xio vgl vnl vbl vsl vcl)
#install the .h .txx and libs
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
-@@ -47,6 +47,9 @@ SET(boxm2_cpp_algo_sources
+Index: vxl-1.17.0/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt 2012-05-31 21:32:59.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -47,6 +47,9 @@
AUX_SOURCE_DIRECTORY(Templates boxm2_cpp_algo_sources)
ADD_LIBRARY(boxm2_cpp_algo ${boxm2_cpp_algo_sources})
+SET_TARGET_PROPERTIES(boxm2_cpp_algo PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
-+ INSTALL_TARGETS( /lib boxm2_cpp_algo)
-+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${boxm2_cpp_algo_sources})
++INSTALL_TARGETS( /lib boxm2_cpp_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${boxm2_cpp_algo_sources})
TARGET_LINK_LIBRARIES(boxm2_cpp_algo
boxm2_cpp brad boct brdb expatpp vpgl bvgl imesh imesh_algo bsta_algo bsta vil_algo vil vgl_xio vgl vnl_algo vnl vul vbl_io vbl vsl vcl bvpl rply)
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/util/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm2/util/CMakeLists.txt
-@@ -17,6 +17,7 @@ SET(boxm2_util_sources
+Index: vxl-1.17.0/contrib/brl/bseg/boxm2/util/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/util/CMakeLists.txt 2012-05-17 00:20:16.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm2/util/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -17,6 +17,7 @@
#AUX_SOURCE_DIRECTORY(Templates boxm2_io_sources)
ADD_LIBRARY(boxm2_util ${boxm2_util_sources})
@@ -252,9 +202,11 @@
TARGET_LINK_LIBRARIES(boxm2_util boxm2 bwm_video bil_algo expatpp vpgl baio vpgl vnl vidl vil_algo vil vgl_algo vgl_xio vgl vbl vul vsl vcl)
#install the .h .txx and libs
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm/CMakeLists.txt
-@@ -21,6 +21,7 @@ SET(boxm_sources
+Index: vxl-1.17.0/contrib/brl/bseg/boxm/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm/CMakeLists.txt 2012-05-17 15:10:29.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -21,6 +21,7 @@
AUX_SOURCE_DIRECTORY(Templates boxm_sources)
ADD_LIBRARY(boxm ${boxm_sources})
@@ -262,49 +214,57 @@
TARGET_LINK_LIBRARIES(boxm boct bsta brdb vgl_io vgl_xio vpgl vpgl_xio vpgl_algo vsol expatpp vgl_algo vnl_algo vnl vgl vul vil vbl_io vbl vsl vpl vcl)
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm/sample/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm/sample/CMakeLists.txt
-@@ -19,7 +19,10 @@ SET(boxm_sample_sources
+Index: vxl-1.17.0/contrib/brl/bseg/boxm/sample/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm/sample/CMakeLists.txt 2012-05-31 19:14:15.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm/sample/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -19,7 +19,10 @@
AUX_SOURCE_DIRECTORY(Templates boxm_sample_sources)
ADD_LIBRARY(boxm_sample ${boxm_sample_sources})
+SET_TARGET_PROPERTIES(boxm_sample PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
TARGET_LINK_LIBRARIES(boxm_sample boxm vgl_io bsta vil vgl vbl vsl vcl)
-+ INSTALL_TARGETS( /lib boxm_sample)
-+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${boxm_sample_sources})
++INSTALL_TARGETS( /lib boxm_sample)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${boxm_sample_sources})
IF( BUILD_TESTING )
SUBDIRS(tests)
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
-@@ -10,8 +10,11 @@ SET(boxm_sample_algo_sources
+Index: vxl-1.17.0/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt 2012-05-31 19:14:15.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm/sample/algo/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -10,8 +10,11 @@
AUX_SOURCE_DIRECTORY(Templates boxm_sample_algo_sources)
ADD_LIBRARY(boxm_sample_algo ${boxm_sample_algo_sources})
+SET_TARGET_PROPERTIES(boxm_sample_algo PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
TARGET_LINK_LIBRARIES(boxm_sample_algo boxm_sample boxm boxm_util bsta bsta_algo vnl vgl_io vbl)
-+ INSTALL_TARGETS( /lib boxm_sample_algo)
-+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${boxm_sample_algo_sources})
++INSTALL_TARGETS( /lib boxm_sample_algo)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${boxm_sample_algo_sources})
IF( BUILD_TESTING )
SUBDIRS(tests)
---- vxl-1.17.0.orig/contrib/brl/bseg/boxm/util/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bseg/boxm/util/CMakeLists.txt
-@@ -16,7 +16,10 @@ SET(boxm_util_sources
+Index: vxl-1.17.0/contrib/brl/bseg/boxm/util/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bseg/boxm/util/CMakeLists.txt 2012-05-31 19:14:15.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bseg/boxm/util/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -16,7 +16,10 @@
AUX_SOURCE_DIRECTORY(Templates boxm_util_sources)
ADD_LIBRARY(boxm_util ${boxm_util_sources})
+SET_TARGET_PROPERTIES(boxm_util PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
TARGET_LINK_LIBRARIES(boxm_util boxm boxm_sample bvrml boct bsta vpgl_algo vnl_algo vgl_algo vpgl vnl_io vil vgl vnl vbl vcl)
-+ INSTALL_TARGETS( /lib boxm_util)
-+ INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${boxm_util_sources})
++INSTALL_TARGETS( /lib boxm_util)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/v3p/netlib ${boxm_util_sources})
IF( BUILD_TESTING )
SUBDIRS(tests)
---- vxl-1.17.0.orig/contrib/brl/bbas/bwm/io/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/bwm/io/CMakeLists.txt
-@@ -20,6 +20,7 @@ IF(EXPAT_FOUND)
+Index: vxl-1.17.0/contrib/brl/bbas/bwm/io/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bwm/io/CMakeLists.txt 2011-09-27 19:29:36.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bwm/io/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -20,6 +20,7 @@
ENDIF(EXPAT_FOUND)
ADD_LIBRARY(bwm_io ${bwm_io_sources})
@@ -312,9 +272,11 @@
TARGET_LINK_LIBRARIES(bwm_io vsol vsl vbl)
---- vxl-1.17.0.orig/contrib/brl/bbas/bwm/reg/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/bwm/reg/CMakeLists.txt
-@@ -14,6 +14,7 @@ SET(bwm_reg_sources
+Index: vxl-1.17.0/contrib/brl/bbas/bwm/reg/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bwm/reg/CMakeLists.txt 2011-11-17 14:38:49.000000000 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bwm/reg/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -14,6 +14,7 @@
AUX_SOURCE_DIRECTORY(Templates bwm_reg_sources)
ADD_LIBRARY(bwm_reg ${bwm_reg_sources})
@@ -322,9 +284,11 @@
TARGET_LINK_LIBRARIES( bwm_reg brip sdet vil vbl vgl vnl bsta bsol vsol vpgl vpgl_algo )
---- vxl-1.17.0.orig/contrib/brl/bbas/bwm/video/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/bwm/video/CMakeLists.txt
-@@ -28,6 +28,7 @@ ENDIF(EXPAT_FOUND)
+Index: vxl-1.17.0/contrib/brl/bbas/bwm/video/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bwm/video/CMakeLists.txt 2011-11-17 14:38:49.000000000 +0100
++++ vxl-1.17.0/contrib/brl/bbas/bwm/video/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -28,6 +28,7 @@
AUX_SOURCE_DIRECTORY(Templates bwm_video_sources)
ADD_LIBRARY(bwm_video ${bwm_video_sources})
@@ -332,9 +296,11 @@
TARGET_LINK_LIBRARIES( bwm_video vidl bpgl bpgl_algo brip vil vbl vgl vul vpl vsl vgl_algo vnl_algo vnl bsta bsol vsol vpgl vpgl_algo)
---- vxl-1.17.0.orig/contrib/brl/bbas/baio/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/baio/CMakeLists.txt
-@@ -21,6 +21,7 @@ ELSE(WIN32)
+Index: vxl-1.17.0/contrib/brl/bbas/baio/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/baio/CMakeLists.txt 2011-10-02 21:38:34.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bbas/baio/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -21,6 +21,7 @@
ENDIF(WIN32)
ADD_LIBRARY(baio ${baio_sources})
@@ -342,9 +308,11 @@
IF(APPLE)
TARGET_LINK_LIBRARIES(baio c)
---- vxl-1.17.0.orig/contrib/brl/bbas/bvrml/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/bvrml/CMakeLists.txt
-@@ -6,6 +6,7 @@ SET(bvrml_sources
+Index: vxl-1.17.0/contrib/brl/bbas/bvrml/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bvrml/CMakeLists.txt 2012-05-15 22:22:17.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bvrml/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -6,6 +6,7 @@
)
ADD_LIBRARY(bvrml ${bvrml_sources})
@@ -352,16 +320,18 @@
TARGET_LINK_LIBRARIES(bvrml vgl)
-@@ -16,4 +17,4 @@ ENDIF( BUILD_TESTING )
+@@ -16,4 +17,4 @@
SUBDIRS(pro)
INSTALL_TARGETS(/lib bvrml)
-INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bvrml ${bvrml_sources})
\ No newline at end of file
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bvrml ${bvrml_sources})
---- vxl-1.17.0.orig/contrib/brl/bbas/bsta/io/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/bsta/io/CMakeLists.txt
-@@ -16,6 +16,7 @@ SET(bsta_io_sources
+Index: vxl-1.17.0/contrib/brl/bbas/bsta/io/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bsta/io/CMakeLists.txt 2011-09-27 19:29:36.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bsta/io/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -16,6 +16,7 @@
#AUX_SOURCE_DIRECTORY(Templates bsta_io_sources)
ADD_LIBRARY(bsta_io ${bsta_io_sources})
@@ -369,9 +339,11 @@
TARGET_LINK_LIBRARIES(bsta_io bsta vnl_io vbl_io vbl)
IF( BUILD_TESTING )
---- vxl-1.17.0.orig/contrib/brl/bbas/bsta/algo/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/bsta/algo/CMakeLists.txt
-@@ -21,6 +21,7 @@ SET( bsta_algo_sources
+Index: vxl-1.17.0/contrib/brl/bbas/bsta/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bsta/algo/CMakeLists.txt 2011-09-27 19:29:36.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bsta/algo/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -21,6 +21,7 @@
AUX_SOURCE_DIRECTORY(Templates bsta_algo_sources)
ADD_LIBRARY( bsta_algo ${bsta_algo_sources} )
@@ -379,9 +351,11 @@
TARGET_LINK_LIBRARIES(bsta_algo bsta vnl_algo vnl vbl)
IF( BUILD_TESTING )
---- vxl-1.17.0.orig/contrib/brl/bbas/bsta/pro/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/bsta/pro/CMakeLists.txt
-@@ -13,6 +13,7 @@ AUX_SOURCE_DIRECTORY(Templates bsta_pro_
+Index: vxl-1.17.0/contrib/brl/bbas/bsta/pro/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bsta/pro/CMakeLists.txt 2011-09-27 19:29:36.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bsta/pro/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -13,6 +13,7 @@
AUX_SOURCE_DIRECTORY(processes bsta_pro_sources)
ADD_LIBRARY(bsta_pro ${bsta_pro_sources} )
@@ -389,9 +363,11 @@
TARGET_LINK_LIBRARIES(bsta_pro bsta_algo bsta_io bsta bprb brdb brip vbl_io)
---- vxl-1.17.0.orig/contrib/brl/bbas/vsph/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/vsph/CMakeLists.txt
-@@ -14,6 +14,7 @@ AUX_SOURCE_DIRECTORY(Templates vsph_sour
+Index: vxl-1.17.0/contrib/brl/bbas/vsph/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/vsph/CMakeLists.txt 2012-05-16 02:27:55.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bbas/vsph/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -14,6 +14,7 @@
ADD_LIBRARY(vsph ${vsph_sources})
TARGET_LINK_LIBRARIES(vsph vpgl vpgl_algo vpgl_io vgl_algo vgl_io vgl vbl vnl vcl bpgl_algo)
@@ -399,15 +375,17 @@
IF(BUILD_TESTING)
SUBDIRS(tests)
-@@ -22,4 +23,4 @@ ENDIF(BUILD_TESTING)
+@@ -22,4 +23,4 @@
INSTALL_TARGETS(/lib vsph)
-INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/vsph ${vsph_sources})
\ No newline at end of file
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/vsph ${vsph_sources})
---- vxl-1.17.0.orig/contrib/brl/bbas/brad/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/brad/CMakeLists.txt
+Index: vxl-1.17.0/contrib/brl/bbas/brad/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/brad/CMakeLists.txt 2012-02-22 02:49:53.000000000 +0100
++++ vxl-1.17.0/contrib/brl/bbas/brad/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
@@ -22,6 +22,7 @@
)
AUX_SOURCE_DIRECTORY(Templates brad_sources)
@@ -416,9 +394,11 @@
TARGET_LINK_LIBRARIES(brad bsta vnl_io vnl vgl_algo vnl_algo vgl vil vpgl vpgl_algo vbl_io vbl vpl vul )
---- vxl-1.17.0.orig/contrib/brl/bbas/brad/io/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/brad/io/CMakeLists.txt
-@@ -8,6 +8,7 @@ SET(brad_io_sources
+Index: vxl-1.17.0/contrib/brl/bbas/brad/io/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/brad/io/CMakeLists.txt 2012-01-28 21:25:13.000000000 +0100
++++ vxl-1.17.0/contrib/brl/bbas/brad/io/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -8,6 +8,7 @@
AUX_SOURCE_DIRECTORY(Templates brad_io_sources)
ADD_LIBRARY(brad_io ${brad_io_sources})
@@ -426,9 +406,11 @@
TARGET_LINK_LIBRARIES(brad_io brad vnl_io vbl_io vbl)
IF( BUILD_TESTING )
---- vxl-1.17.0.orig/contrib/brl/bbas/bpgl/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/bpgl/CMakeLists.txt
-@@ -18,6 +18,7 @@ bpgl_camera_estimator.h bpgl_camera_esti
+Index: vxl-1.17.0/contrib/brl/bbas/bpgl/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bpgl/CMakeLists.txt 2012-05-15 22:30:46.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bpgl/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -18,6 +18,7 @@
AUX_SOURCE_DIRECTORY(Templates bpgl_sources)
ADD_LIBRARY(bpgl ${bpgl_sources})
@@ -436,16 +418,18 @@
TARGET_LINK_LIBRARIES(bpgl brip vpgl vpgl_algo vpgl_io vgl_algo vgl_io vgl vbl vnl vcl)
# algorithms involving cameras
-@@ -34,4 +35,4 @@ IF(BUILD_TESTING)
+@@ -34,4 +35,4 @@
ENDIF(BUILD_TESTING)
INSTALL_TARGETS(/lib bpgl)
-INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bpgl ${bpgl_sources})
\ No newline at end of file
+INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bpgl ${bpgl_sources})
---- vxl-1.17.0.orig/contrib/brl/bbas/bpgl/algo/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/bpgl/algo/CMakeLists.txt
-@@ -32,7 +32,7 @@ ENDIF(BUILD_RPL)
+Index: vxl-1.17.0/contrib/brl/bbas/bpgl/algo/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/bpgl/algo/CMakeLists.txt 2012-05-24 16:33:50.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bbas/bpgl/algo/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -32,7 +32,7 @@
AUX_SOURCE_DIRECTORY(Templates bpgl_algo_sources)
ADD_LIBRARY(bpgl_algo ${bpgl_algo_sources})
@@ -454,9 +438,11 @@
TARGET_LINK_LIBRARIES(bpgl_algo bpgl vpgl vpgl_file_formats vsol vgl_algo vnl_algo vnl vgl vil vul vbl)
IF(BUILD_RPL)
---- vxl-1.17.0.orig/contrib/brl/bbas/imesh/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bbas/imesh/CMakeLists.txt
-@@ -21,6 +21,7 @@ SET(imesh_sources
+Index: vxl-1.17.0/contrib/brl/bbas/imesh/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bbas/imesh/CMakeLists.txt 2011-09-27 19:29:36.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bbas/imesh/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -21,6 +21,7 @@
AUX_SOURCE_DIRECTORY(Templates imesh_sources)
ADD_LIBRARY(imesh ${imesh_sources})
@@ -464,19 +450,23 @@
TARGET_LINK_LIBRARIES(imesh vgl vul brdb vbl_io vbl)
---- vxl-1.17.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt
-@@ -22,6 +22,7 @@ IF(WIN32)
+Index: vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
++++ vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -22,6 +22,7 @@
ENDIF(WIN32)
ADD_LIBRARY( minizip ${minizip_sources} )
-+ TARGET_LINK_LIBRARIES( minizip z)
++TARGET_LINK_LIBRARIES( minizip z)
SET_TARGET_PROPERTIES(minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES})
INSTALL_TARGETS( /lib minizip )
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/minizip ${minizip_sources})
---- vxl-1.17.0.orig/contrib/brl/bpro/core/bbas_pro/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bpro/core/bbas_pro/CMakeLists.txt
-@@ -20,6 +20,7 @@ AUX_SOURCE_DIRECTORY(processes bbas_pro_
+Index: vxl-1.17.0/contrib/brl/bpro/core/bbas_pro/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bpro/core/bbas_pro/CMakeLists.txt 2012-05-31 19:15:56.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bpro/core/bbas_pro/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -20,6 +20,7 @@
ADD_LIBRARY(bbas_pro ${bbas_pro_sources})
TARGET_LINK_LIBRARIES(bbas_pro bprb brdb brad brad_io bsta_io bsta vpgl vpgl_algo vil_io vil vnl_io vnl_algo vnl vgl vbl_io vbl vsl imesh)
@@ -484,9 +474,11 @@
INSTALL_TARGETS(/lib bbas_pro)
INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/bbas_pro ${bbas_pro_sources})
---- vxl-1.17.0.orig/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt
-+++ vxl-1.17.0/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt
-@@ -13,6 +13,7 @@ AUX_SOURCE_DIRECTORY(Templates vpgl_pro_
+Index: vxl-1.17.0/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt 2012-05-31 18:20:00.000000000 +0200
++++ vxl-1.17.0/contrib/brl/bpro/core/vpgl_pro/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -13,6 +13,7 @@
AUX_SOURCE_DIRECTORY(processes vpgl_pro_sources)
ADD_LIBRARY(vpgl_pro ${vpgl_pro_sources})
@@ -494,9 +486,11 @@
TARGET_LINK_LIBRARIES(vpgl_pro bprb vsph bpgl bpgl_algo vpgl_io vpgl vpgl_algo vnl vil vgl vbl_io vul bbas_pro)
INSTALL_TARGETS(/lib vpgl_pro)
---- vxl-1.17.0.orig/v3p/rply/CMakeLists.txt
-+++ vxl-1.17.0/v3p/rply/CMakeLists.txt
-@@ -7,6 +7,7 @@ SET(rply_sources
+Index: vxl-1.17.0/v3p/rply/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/v3p/rply/CMakeLists.txt 2011-09-27 19:45:20.000000000 +0200
++++ vxl-1.17.0/v3p/rply/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -7,6 +7,7 @@
)
ADD_LIBRARY(rply ${rply_sources})
@@ -504,13 +498,15 @@
#install the .h .txx and libs
INSTALL_TARGETS(/lib rply)
---- vxl-1.17.0.orig/v3p/openjpeg2/CMakeLists.txt
-+++ vxl-1.17.0/v3p/openjpeg2/CMakeLists.txt
-@@ -38,6 +38,7 @@ ADD_DEFINITIONS( ${OPENJPEG2_DEFINITIONS
+Index: vxl-1.17.0/v3p/openjpeg2/CMakeLists.txt
+===================================================================
+--- vxl-1.17.0.orig/v3p/openjpeg2/CMakeLists.txt 2011-05-22 16:50:44.000000000 +0200
++++ vxl-1.17.0/v3p/openjpeg2/CMakeLists.txt 2012-11-28 18:34:11.000000000 +0100
+@@ -38,6 +38,7 @@
# Pass proper definition to preprocessor to generate shared lib
ADD_LIBRARY(openjpeg2 ${OPENJPEG2_SRCS})
-+ TARGET_LINK_LIBRARIES( openjpeg2 m)
++TARGET_LINK_LIBRARIES(openjpeg2 m)
SET_TARGET_PROPERTIES(openjpeg2 PROPERTIES
VERSION 2.0.0
DEFINE_SYMBOL OPJ_EXPORTS)
More information about the debian-med-commit
mailing list