Author: malat
Date: 2012-07-28 23:04:00 +0000 (Sat, 28 Jul 2012)
New Revision: 11937
Added:
trunk/packages/vxl/trunk/debian/patches/fixingupstream.patch
Modified:
trunk/packages/vxl/trunk/debian/patches/series
Log:
Fix upstream cmake issues
Added: trunk/packages/vxl/trunk/debian/patches/fixingupstream.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/fixingupstream.patch
(rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/fixingupstream.patch
2012-07-28 23:04:00 UTC (rev 11937)
@@ -0,0 +1,516 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ vxl (1.17.0-1) UNRELEASED; urgency=low
+ .
+ * New upstream
+Author: Mathieu Malaterre <ma...@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- vxl-1.17.0.orig/core/vpgl/CMakeLists.txt
++++ vxl-1.17.0/core/vpgl/CMakeLists.txt
+@@ -32,6 +32,7 @@ SET( vpgl_sources
+ AUX_SOURCE_DIRECTORY(Templates vpgl_sources)
+
+ ADD_LIBRARY(vpgl ${vpgl_sources})
++SET_TARGET_PROPERTIES(vpgl PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+ 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
+ AUX_SOURCE_DIRECTORY(Templates vpgl_io_sources)
+
+ ADD_LIBRARY(vpgl_io ${vpgl_io_sources})
+-
++SET_TARGET_PROPERTIES(vpgl_io PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+ 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)
+ ENDIF(TIFF_FOUND)
+
+ ADD_LIBRARY(vpgl_file_formats ${vpgl_file_formats_sources})
+-
++SET_TARGET_PROPERTIES(vpgl_file_formats PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ 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
+ 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)
+
+-
+ 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
+
+ ADD_LIBRARY(vpgl_xio ${vpgl_xio_sources} )
+ TARGET_LINK_LIBRARIES( vpgl_xio vpgl vsl )
++SET_TARGET_PROPERTIES(vpgl_xio PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+
+ 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
+ AUX_SOURCE_DIRECTORY(Templates vgl_xio_sources)
+
+ ADD_LIBRARY(vgl_xio ${vgl_xio_sources})
++SET_TARGET_PROPERTIES(vgl_xio PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ 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
+ )
+
+ ADD_LIBRARY(vpl ${vpl_sources})
++SET_TARGET_PROPERTIES(vpl PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+ 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
+ AUX_SOURCE_DIRECTORY(Templates rrel_sources)
+
+ ADD_LIBRARY(rrel ${rrel_sources})
++SET_TARGET_PROPERTIES(rrel PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+
+ 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
+ AUX_SOURCE_DIRECTORY(Templates bvxm_grid_sources)
+
+ ADD_LIBRARY( bvxm_grid ${bvxm_grid_sources})
+-
++SET_TARGET_PROPERTIES(bvxm_grid PROPERTIES ${VNL_LIBRARY_PROPERTIES})
++INSTALL_TARGETS(/lib bvxm_grid)
++INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvxm/grid
${rsdl_sources})
+ 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)
+ AUX_SOURCE_DIRECTORY(Templates boxm2_sources)
+
+ ADD_LIBRARY(boxm2 ${boxm2_sources})
++SET_TARGET_PROPERTIES(boxm2 PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+ 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_
+
+ ADD_LIBRARY(boxm2_io ${boxm2_io_sources})
+ TARGET_LINK_LIBRARIES(boxm2_io boxm2 expatpp vpgl baio vpgl vgl_xio vgl vbl
vul vsl vcl)
++SET_TARGET_PROPERTIES(boxm2_io PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+
+ #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
+ AUX_SOURCE_DIRECTORY(Templates boxm2_basic_sources)
+
+ ADD_LIBRARY(boxm2_basic ${boxm2_basic_sources})
++SET_TARGET_PROPERTIES(boxm2_basic PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ 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
+ 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})
+ 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
+ #AUX_SOURCE_DIRECTORY(Templates boxm2_io_sources)
+
+ ADD_LIBRARY(boxm2_util ${boxm2_util_sources})
++SET_TARGET_PROPERTIES(boxm2_util PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+ 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
+ AUX_SOURCE_DIRECTORY(Templates boxm_sources)
+
+ ADD_LIBRARY(boxm ${boxm_sources})
++SET_TARGET_PROPERTIES(boxm PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+
+ 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
+ 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})
+
+ 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
+ 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})
+
+ 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
+ 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})
+
+ 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)
+ ENDIF(EXPAT_FOUND)
+
+ ADD_LIBRARY(bwm_io ${bwm_io_sources})
++SET_TARGET_PROPERTIES(bwm_io PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+
+ 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
+ AUX_SOURCE_DIRECTORY(Templates bwm_reg_sources)
+
+ ADD_LIBRARY(bwm_reg ${bwm_reg_sources})
++SET_TARGET_PROPERTIES(bwm_reg PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+
+ 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)
+
+ AUX_SOURCE_DIRECTORY(Templates bwm_video_sources)
+ ADD_LIBRARY(bwm_video ${bwm_video_sources})
++SET_TARGET_PROPERTIES(bwm_video PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+
+ 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)
+ ENDIF(WIN32)
+
+ ADD_LIBRARY(baio ${baio_sources})
++SET_TARGET_PROPERTIES(baio PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+
+ 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
+ )
+
+ ADD_LIBRARY(bvrml ${bvrml_sources})
++SET_TARGET_PROPERTIES(bvrml PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+
+ TARGET_LINK_LIBRARIES(bvrml vgl)
+
+@@ -16,4 +17,4 @@ ENDIF( BUILD_TESTING )
+ 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
+ #AUX_SOURCE_DIRECTORY(Templates bsta_io_sources)
+
+ ADD_LIBRARY(bsta_io ${bsta_io_sources})
++SET_TARGET_PROPERTIES(bsta_io PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+ 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
+ AUX_SOURCE_DIRECTORY(Templates bsta_algo_sources)
+
+ ADD_LIBRARY( bsta_algo ${bsta_algo_sources} )
++SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ 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_
+ AUX_SOURCE_DIRECTORY(processes bsta_pro_sources)
+
+ ADD_LIBRARY(bsta_pro ${bsta_pro_sources} )
++SET_TARGET_PROPERTIES(bsta_pro PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+
+ 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
+
+ ADD_LIBRARY(vsph ${vsph_sources})
+ TARGET_LINK_LIBRARIES(vsph vpgl vpgl_algo vpgl_io vgl_algo vgl_io vgl vbl vnl
vcl bpgl_algo)
++SET_TARGET_PROPERTIES(vsph PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+
+ IF(BUILD_TESTING)
+ SUBDIRS(tests)
+@@ -22,4 +23,4 @@ ENDIF(BUILD_TESTING)
+
+
+ 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
+@@ -22,6 +22,7 @@
+ )
+ AUX_SOURCE_DIRECTORY(Templates brad_sources)
+ ADD_LIBRARY(brad ${brad_sources} )
++ SET_TARGET_PROPERTIES(brad PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+
+ 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
+ AUX_SOURCE_DIRECTORY(Templates brad_io_sources)
+
+ ADD_LIBRARY(brad_io ${brad_io_sources})
++SET_TARGET_PROPERTIES(brad_io PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ 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
+ AUX_SOURCE_DIRECTORY(Templates bpgl_sources)
+
+ ADD_LIBRARY(bpgl ${bpgl_sources})
++SET_TARGET_PROPERTIES(bpgl PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ 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)
+ 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)
+ AUX_SOURCE_DIRECTORY(Templates bpgl_algo_sources)
+
+ ADD_LIBRARY(bpgl_algo ${bpgl_algo_sources})
+-
++SET_TARGET_PROPERTIES(bpgl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ 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
+ AUX_SOURCE_DIRECTORY(Templates imesh_sources)
+
+ ADD_LIBRARY(imesh ${imesh_sources})
++SET_TARGET_PROPERTIES(imesh PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+
+ 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)
+ ENDIF(WIN32)
+
+ ADD_LIBRARY( minizip ${minizip_sources} )
++ 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_
+
+ 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)
++SET_TARGET_PROPERTIES(bbas_pro PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+
+ 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_
+ AUX_SOURCE_DIRECTORY(processes vpgl_pro_sources)
+
+ ADD_LIBRARY(vpgl_pro ${vpgl_pro_sources})
++SET_TARGET_PROPERTIES(vpgl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES})
+ 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
+ )
+
+ ADD_LIBRARY(rply ${rply_sources})
++SET_TARGET_PROPERTIES(rply PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES})
+
+ #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
+
+ # Pass proper definition to preprocessor to generate shared lib
+ ADD_LIBRARY(openjpeg2 ${OPENJPEG2_SRCS})
++ TARGET_LINK_LIBRARIES( openjpeg2 m)
+ SET_TARGET_PROPERTIES(openjpeg2 PROPERTIES
+ VERSION 2.0.0
+ DEFINE_SYMBOL OPJ_EXPORTS)
Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series 2012-07-28 20:06:46 UTC
(rev 11936)
+++ trunk/packages/vxl/trunk/debian/patches/series 2012-07-28 23:04:00 UTC
(rev 11937)
@@ -1,3 +1,4 @@
fixcompilation2.patch
vxl.soname.patch
renamelibs.patch
+fixingupstream.patch
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
