debian/0000755000000000000000000000000012246042705007170 5ustar debian/rules0000755000000000000000000000632212245636771010266 0ustar #!/usr/bin/make -f #export DH_VERBOSE=1 # http://bugs.debian.org/718047 # -> debian-release team blessing: http://bugs.debian.org/728574#18 ifneq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU ), ia64) export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed endif VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-) SOVERSION = $(shell echo $(VER_FULL) | cut -f1-2 -d.) VER_MAJOR = $(shell echo $(VER_FULL) | cut -f1 -d.) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) UPSTREAM_SRC = vxl-$(VER_FULL) DEBIAN_SRC_DIR = vxl-$(VER_FULL) DEBIAN_SRC_TAR = vxl_$(VER_FULL).orig.tar.gz PYTHON_INCLUDE_DIRS=$(shell python-config --includes | cut -f1 -d' '|cut -c3-) PYTHON_INCLUDE_DIR="$(PYTHON_INCLUDE_DIRS)" # See bug #709181 PYTHON_INCLUDE_DIRS2=$(shell python-config --includes | cut -f2 -d' '|cut -c3-) PYTHON_INCLUDE_DIR2="$(PYTHON_INCLUDE_DIRS2)" PYTHON_CONFIG_DIR=$(shell python-config --configdir) PYTHON_LIBRARY="$(PYTHON_CONFIG_DIR)/libpython2.7.so" # CMAKE_SKIP_RPATH=OFF is required when BUILD_TESTING=ON # Do not set CMAKE_BUILD_TYPE / http://bugs.debian.org/711515 CMAKE_EXTRA_FLAGS = \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DCMAKE_BUILD_TYPE:STRING="" \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DAVIFILE_INCLUDE_DIR:PATH=/usr/include/avifile-0.7 \ -DVXL_USING_NATIVE_ZLIB:BOOL=ON \ -DVXL_USING_NATIVE_JPEG:BOOL=ON \ -DVXL_USING_NATIVE_BZLIB2:BOOL=ON \ -DVXL_USING_NATIVE_MPEG2:BOOL=ON \ -DVXL_USING_NATIVE_PNG:BOOL=ON \ -DVXL_USING_NATIVE_TIFF:BOOL=ON \ -DVXL_USING_NATIVE_SHAPELIB:BOOL=ON \ -DVXL_USING_NATIVE_GEOTIFF:BOOL=ON \ -DVXL_USING_NATIVE_EXPAT:BOOL=ON \ -DBUILD_VGUI:BOOL=ON \ -DBUILD_BGUI3D:BOOL=ON \ -DVXL_BUILD_DCMTK:BOOL=ON \ -DBUILD_OXL:BOOL=ON \ -DBUILD_CORE_GEOMETRY:BOOL=ON \ -DBUILD_CORE_IMAGING:BOOL=ON \ -DBUILD_CORE_NUMERICS:BOOL=ON \ -DBUILD_CORE_PROBABILITY:BOOL=ON \ -DBUILD_CORE_SERIALISATION:BOOL=ON \ -DBUILD_CORE_UTILITIES:BOOL=ON \ -DBUILD_CORE_VIDEO:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=OFF \ -DPYTHON_INCLUDE_DIR=$(PYTHON_INCLUDE_DIR) \ -DPYTHON_INCLUDE_DIR2=$(PYTHON_INCLUDE_DIR2) \ -DPYTHON_LIBRARY=$(PYTHON_LIBRARY) \ -DBUILD_TESTING:BOOL=ON pkg_lib = libvxl$(SOVERSION) pkg_dev = libvxl$(VER_MAJOR)-dev #pkg_examples = vxl$(VER_MAJOR)-examples %: dh $@ --buildsystem=cmake --parallel --with python2 override_dh_auto_configure: # remove duplicate from boxm_block+boct_tree+short.vnl_vector_fixed+float rm -f $(CURDIR)/contrib/brl/bseg/boxm/pro/Templates/boxm_scene+boct_tree+short.vnl_vector_fixed+float.3---.cxx dh_auto_configure # See bug: 708131 dh_auto_configure -- $(CMAKE_EXTRA_FLAGS) override_dh_lintian: echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides dh_lintian override_dh_install: dh_install -p$(pkg_lib) debian/tmp/usr/lib/lib*.so.* usr/lib/$(DEB_HOST_MULTIARCH) dh_install -p$(pkg_dev) debian/tmp/usr/lib/lib*.so usr/lib/$(DEB_HOST_MULTIARCH) dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/vxl/cmake/*.cmake # too many tests failure, with erratic behavior # http://bugs.debian.org/671601 override_dh_auto_test: dh_auto_test || true get-orig-source: uscan --verbose --force-download --rename debian/watch0000644000000000000000000000006212005033202010200 0ustar version=3 http://sf.net/vxl/vxl-([\d\.]+)\.tar.gz debian/changelog0000644000000000000000000001542112246042713011044 0ustar vxl (1.17.0-8) unstable; urgency=high * Remove B-D: libtiff5-dev, as it makes vxl FTBFS. Closes: #721493 -- Mathieu Malaterre Fri, 29 Nov 2013 08:41:19 +0100 vxl (1.17.0-7) unstable; urgency=high * Hide symptoms from --as-needed on IA64. Closes: #728574 * Update d/copyright. Closes: #723126 -- Mathieu Malaterre Thu, 28 Nov 2013 14:52:51 +0100 vxl (1.17.0-6) unstable; urgency=medium * Remove B-D: libtiff5-dev, as it makes vxl FTBFS. Closes: #721493 * wrap and sort d/control * Remove -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo from d/rules -- Mathieu Malaterre Mon, 02 Sep 2013 09:21:29 +0200 vxl (1.17.0-5) unstable; urgency=low * Use libcoin80-dev for transition * Fix compilation of opencl module on kFreeBSD -- Mathieu Malaterre Thu, 30 May 2013 10:44:57 +0200 vxl (1.17.0-4) unstable; urgency=low * Fix builds on arm* by removing duplicate symbols * Re-activate testing. Closes: #671601 * Build OpenCL modules. Closes: #697784 * Run two cmake configure steps. Closes: #708131 * make package multiarch -- Mathieu Malaterre Tue, 28 May 2013 15:08:55 +0200 vxl (1.17.0-3) unstable; urgency=low * Import old patch and avoid name clash. Closes: #708666, #708668 * Re-import old sse2.patch, fix compilation. * Re-import old ffmpeg/C99 patch. Closes: #708740 -- Mathieu Malaterre Sun, 19 May 2013 16:11:07 +0200 vxl (1.17.0-2) unstable; urgency=low * Upload to sid. * Fix comp with libav. Closes: #693543 + debian/patches/libav_trunk.patch * Fix compilation issues. Closes: #708358 + debian/patches/bug708358.patch * Fix compilation. Closes: #707472 + debian/patches/bug707472.patch -- Mathieu Malaterre Wed, 15 May 2013 16:53:56 +0200 vxl (1.17.0-1) experimental; urgency=low * New upstream * Use shapelib package * Remove deprecated DMUA flag * Bump Std-Vers to 3.9.4, no changes needed * Re-add avifile binding (see #647787) -- Mathieu Malaterre Fri, 28 Dec 2012 22:31:32 +0100 vxl (1.14.0-18) unstable; urgency=low * Fix compilation with gcc 4.7. Closes: #674350 * Use CPPFLAGS for hardening (using dh/compat 9) -- Mathieu Malaterre Tue, 19 Jun 2012 13:40:50 +0200 vxl (1.14.0-17) unstable; urgency=low * Disable test suite for now * Fix test suite compilation on kFreeBSD. Closes: #671653 -- Mathieu Malaterre Sat, 05 May 2012 21:39:39 +0200 vxl (1.14.0-16) unstable; urgency=low * Use my @d.o alias * Set LDFLAGS to remove lintian warnings * Update d/copyright to use dep5 * Bump Std-Vers to 3.9.3, no changes needed * Explicitly prefer libtiff5-dev in d/control. Closes: #665026 * Fix compilation with png1.5. Closes: #650570 * Fix lintian warning about FSF address * Make sure to compile using 2.7 (3.2 generates FTBFS) * Activate test-suite, remove broken tests for now -- Mathieu Malaterre Fri, 04 May 2012 14:53:49 +0200 vxl (1.14.0-15) unstable; urgency=low * Remove inclusion of doxygen.cmake. Closes: #656922 -- Mathieu Malaterre Mon, 23 Jan 2012 11:07:33 +0100 vxl (1.14.0-14) unstable; urgency=low [ Andreas Tille ] * debian/contol - Added myself to Uploaders - Remove libavifile-0.7-dev from Build-Depends Closes: #647787 [ Mathieu Malaterre ] * Remove libav patch, use upstream patch instead. * Fix missing libraries. -- Mathieu Malaterre Tue, 20 Dec 2011 15:23:03 +0100 vxl (1.14.0-13) unstable; urgency=low * Fix videodev2.h compilation on kFreeBSD. Closes: #651464 -- Mathieu Malaterre Sun, 11 Dec 2011 12:22:27 +0100 vxl (1.14.0-12) unstable; urgency=low * Another attempt at fixing alpha building * Add a patch to install doxygen.cmake. Closes: #651314 -- Mathieu Malaterre Wed, 07 Dec 2011 22:15:15 +0100 vxl (1.14.0-11) unstable; urgency=low * Fix another compilation issue on alpha * Move pre-build operations in auto_configure, since it was broken -- Mathieu Malaterre Sat, 22 Oct 2011 01:46:01 -0400 vxl (1.14.0-10) unstable; urgency=low * Fix compilation on alpha. Closes: #643643 * Redo d/rules. remove tests for now * Compiles DC1394 plugin only on linux-any -- Mathieu Malaterre Wed, 28 Sep 2011 12:13:03 +0200 vxl (1.14.0-9) unstable; urgency=low * Rename libmcal to libmul_mcal. Closes: #639269 * Fix compilation with libav/0.7.2. Closes: #638251 * Bump Standard Version to 3.9.2, no changes needed * Compiles DC1394 plugin -- Mathieu Malaterre Fri, 26 Aug 2011 11:13:58 +0200 vxl (1.14.0-8) unstable; urgency=low * Remove B-D on linux-libc-dev since videodev was deprecated in 2.6.38 anyway * Remove B-D on libdc1394-22-dev to allow building on kfreedbsd-* -- Mathieu Malaterre Thu, 05 May 2011 10:40:29 +0200 vxl (1.14.0-7) unstable; urgency=low * Fix compilation on armel. Closes: #624512 * Explicitly B-D on libav-dev files -- Mathieu Malaterre Fri, 29 Apr 2011 09:38:20 +0200 vxl (1.14.0-6) unstable; urgency=low * Fix compilation on armel. Closes: #624410 -- Mathieu Malaterre Thu, 28 Apr 2011 10:46:46 +0200 vxl (1.14.0-5) unstable; urgency=low * Rename libs to prevent conflicts. Closes: #623511, #624174 -- Mathieu Malaterre Tue, 26 Apr 2011 11:56:39 +0200 vxl (1.14.0-4) unstable; urgency=low * Add another patch for non-intel platform -- Mathieu Malaterre Tue, 19 Apr 2011 21:29:19 +0200 vxl (1.14.0-3) unstable; urgency=low * Remove sse2 instruction from non-sse2 platforms -- Mathieu Malaterre Tue, 19 Apr 2011 08:32:40 +0200 vxl (1.14.0-2) unstable; urgency=low * Start turning more options to ON. Closes: #580671 * Update Standard Version to 3.9.1 (no changes needed) -- Mathieu Malaterre Thu, 07 Apr 2011 17:19:34 +0200 vxl (1.14.0-1) unstable; urgency=low [Mathieu Malaterre] * New upstream * Update standard version to 3.8.4 (no change needed) [Andreas Tille] * Using Dpkg source format version ‘3.0 (quilt)’ (debian/source/format) -- Mathieu Malaterre Mon, 03 May 2010 17:56:56 +0200 vxl (1.13.0-2) unstable; urgency=low * Use system expat (Closes: #560945) -- Mathieu Malaterre Sun, 13 Dec 2009 11:49:36 +0100 vxl (1.13.0-1) unstable; urgency=low * Initial release (Closes: #390999) -- Mathieu Malaterre Wed, 30 Sep 2009 14:07:28 +0200 debian/control0000644000000000000000000000454412246042713010601 0ustar Source: vxl Homepage: http://vxl.sf.net Section: science Priority: optional Maintainer: Debian Med Packaging Team Uploaders: Mathieu Malaterre , Andreas Tille Build-Depends: cmake (>= 2.4.5), debhelper (>= 9), freeglut3-dev, libavcodec-dev, libavformat-dev, libavifile-0.7-dev, libbz2-dev, libcoin80-dev, libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdcmtk2-dev, libexpat-dev, libgeotiff-dev, libtiff-dev, libglu-dev, libjpeg-dev, libmpeg2-4-dev, libpng-dev, libqt4-dev, libqt4-opengl-dev, libshp-dev, libswscale-dev, libxerces-c-dev, ocl-icd-opencl-dev, opencl-headers, python-dev (>= 2.6.6-3~), zlib1g-dev Standards-Version: 3.9.4 X-Python-Version: 2.7 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/vxl/trunk/ Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/vxl/trunk/ Package: libvxl1.17 Section: libs Architecture: any Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Description: C++ Libraries for Computer Vision Research VXL (the Vision-something-Libraries) is a collection of C++ libraries designed for computer vision research and implementation. It was created from TargetJr and the IUE with the aim of making a light, fast and consistent system. VXL is written in ANSI/ISO C++ and is designed to be portable over many platforms. Package: libvxl1-dev Section: libdevel Architecture: any Depends: libvxl1.17 (= ${binary:Version}), ${misc:Depends} Provides: libvxl-dev Description: C++ Libraries for Computer Vision Research VXL (the Vision-something-Libraries) is a collection of C++ libraries designed for computer vision research and implementation. It was created from TargetJr and the IUE with the aim of making a light, fast and consistent system. VXL is written in ANSI/ISO C++ and is designed to be portable over many platforms. . This package contains the development files needed to build your own VXL applications. debian/copyright0000644000000000000000000003537612245632157011146 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: VXL Source: http://vxl.sourceforge.net Files: * Copyright: Copyright (c) 2000-2003 TargetJr Consortium GE Corporate Research and Development (GE CRD) 1 Research Circle Niskayuna, NY 12309 All Rights Reserved Reproduction rights limited as described below. License: BSD-like Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that (i) the above copyright notice and this permission notice appear in all copies of the software and related documentation, (ii) the name TargetJr Consortium (represented by GE CRD), may not be used in any advertising or publicity relating to the software without the specific, prior written permission of GE CRD, and (iii) any modifications are clearly marked and summarized in a change history log. . THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL THE TARGETJR CONSORTIUM BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR ON ANY THEORY OF LIABILITY ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Files: v3p/rply/ Copyright: 2003-2005 Diego Nehab. License: BSD Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: contrib/rpl/rgrl/rgrl_copyright.h Copyright: 2002-2004 Rensselaer Polytechnic Institute License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. . * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. . * Neither the name of Rensselaer Polytechnic Institute nor the names of any of the authors and contributors may be used to endorse or promote products derived from this software without specific prior written permission. . * Modified source versions must be plainly marked as such, and must not be misrepresented as being the original software. . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL RENSALLAER POLYTECHNIC INSTITUTE, THE AUTHORS, OR CONTRIBUTORS BE HELD LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: v3p/Qv/* Copyright: Copyright (c) 1993,94,95,96 Institute for Information Processing and Computer Supported New Media (IICM), Graz University of Technology, Austria. License: This file is part of VRweb. . VRweb is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. . VRweb is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with VRweb; see the file LICENCE. If not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Files: v3p/zlib/* Copyright: Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler License: This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. . Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: . 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. Files: v3p/mpeg2/libmpeg2/* Copyright: Copyright (C) 2000-2002 Michel Lespinasse Copyright (C) 1999-2000 Aaron Holtzman License: GPL (v2 or later) On debian system the license can be found in `/usr/share/common-licenses/GPL-2' Files: v3p/geotiff/* Copyright: Copyright (c) 1999, Frank Warmerdam License: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: core/vul/vul_ios_state.h Copyright: Copyright 2002, 2005 Daryle Walker License: Boost Software License - Version 1.0 - August 17th, 2003 . Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following: . The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: contrib/rpl/rgrl/* Copyright: Copyright 2006-2009 Brad King, Chuck Stewart License: BSL (v1.0) Boost Software License - Version 1.0 - August 17th, 2003 . Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following: . The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: contrib/brl/b3p/shapelib/* Copyright: Copyright (c) 1999, Frank Warmerdam License: MIT-X11 This software is available under the following "MIT Style" license, or at the option of the licensee under the LGPL (see LICENSE.LGPL). This option is discussed in more detail in shapelib.html. . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: contrib/brl/b3p/minizip/* Copyright: Copyright (C) 1998-2005 Gilles Vollant License: zlib This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. . Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: . 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. Files: vidl_vil1/vidl_vil1_mpegcodec.cxx vidl1/vidl1_mpegcodec.cxx Copyright: Copyright (C) 2000-2002 Michel Lespinasse Copyright (C) 1999-2000 Aaron Holtzman License: GPL-2+ On debian system the license can be found in `/usr/share/common-licenses/GPL-2' Files: vcl/internal/* vcl_atomic_count.h Copyright: Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd. Copyright (c) 2002 Lars Gullik Bjønnes Copyright (c) 2006 Michael van der Westhuizen Copyright (c) 2001-2005 Peter Dimov Copyright 2007 Peter Dimov License: BSL (v1.0) Boost Software License - Version 1.0 - August 17th, 2003 . Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following: . The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: debian/* Copyright: 2009-2012, Mathieu Malaterre License: GPL-2+ The Debian packaging is licensed under the GPL-2 or any later version, see `/usr/share/common-licenses/GPL-2' debian/source/0000755000000000000000000000000012246042705010470 5ustar debian/source/format0000644000000000000000000000001411367765644011717 0ustar 3.0 (quilt) debian/compat0000644000000000000000000000000211770062544010372 0ustar 9 debian/README.source0000644000000000000000000000205312150652617011352 0ustar To prevent conflicts with other libraries, common library name have been renamed. In particular: libosl.so became liboxl_osl.so (provided by libosl-dev) libminizip.so becamse libb3p_minizip.so (provided by libkml-dev) libgst.so became liboxl_gst.so (provided by libgst-dev) libmcal.so became libmul_mcal.so (provided by libmcal0-dev) --- Tests have been deactivated for now, they fails on amd64 with: The following tests FAILED: 104 - vnl_test_sparse_matrix (SEGFAULT) 361 - mbl_test_sample_stats_1d (Failed) 642 - bsta_test_parzen_sphere (Failed) 650 - bsta_test_beta (Failed) 656 - bsta_algo_test_von_mises_update (Failed) 657 - bsta_algo_test_beta_updater (Failed) 695 - brip_test_mask (Failed) 697 - brip_test_extrema (OTHER_FAULT) 718 - bvxm_test_rpc_registration_process (Failed) 732 - bmdl_classify_process (SEGFAULT) 743 - brec_test_part_hierarchy_learner (Failed) 746 - brec_test_hierarchy_detector2 (SEGFAULT) 761 - boxm_test_update (OTHER_FAULT) 762 - boxm_test_update_multi_bin (OTHER_FAULT) 774 - test_octree_kernel_operator (Failed) debian/patches/0000755000000000000000000000000012246042705010617 5ustar debian/patches/bug707472.patch0000644000000000000000000000235012144721037013107 0ustar Description: FTBFS: vidl_v4l2_control.h:39:48: error: invalid conversion from '__u32 {aka unsigned int}' to 'v4l2_ctrl_type' [-fpermissive] Author: Mathieu Malaterre Bug-Debian: http://bugs.debian.org/707472 Forwarded: no --- vxl-1.17.0.orig/core/vidl/vidl_v4l2_control.h +++ vxl-1.17.0/core/vidl/vidl_v4l2_control.h @@ -38,7 +38,7 @@ class vidl_v4l2_control static vidl_v4l2_control * new_control(const v4l2_queryctrl& ctr, int f); //: Type of control // \return type as indicated in v4l2 specification - v4l2_ctrl_type type() const { return ctrl_.type; } + v4l2_ctrl_type type() const { return (v4l2_ctrl_type)ctrl_.type; } //: Name of control // \return name the driver assign to the control vcl_string name() const { return (const char *) ctrl_.name; } --- vxl-1.17.0.orig/contrib/brl/bbas/bocl/bocl_mem.cxx +++ vxl-1.17.0/contrib/brl/bbas/bocl/bocl_mem.cxx @@ -1,3 +1,4 @@ +#define CL_USE_DEPRECATED_OPENCL_1_1_APIS #include "bocl_mem.h" //: // \file @@ -9,6 +10,8 @@ #include #include +#include + bocl_mem::bocl_mem(const cl_context& context, void* buffer, unsigned num_bytes, vcl_string id) : cpu_buf_(buffer), delete_cpu_(false), debian/patches/vxl.soname.patch0000644000000000000000000020403612067410536013741 0ustar Description: adding SONAME to library to be public Author: Mathieu Malaterre Last-Update: 2011-07-24 Index: vxl-1.17.0/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/CMakeLists.txt 2012-12-28 22:37:41.515500319 +0100 +++ vxl-1.17.0/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -12,6 +12,26 @@ PROJECT(vxl) +SET(VXL_MAJOR_VERSION 1) +SET(VXL_MINOR_VERSION 17) +SET(VXL_BUILD_VERSION 0) +SET(VXL_VERSION + "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}.${VXL_BUILD_VERSION}") +SET(VXL_API_VERSION + "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}") +SET(VXL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES} + VERSION "${VXL_VERSION}" + SOVERSION "${VXL_API_VERSION}" +) +SET(NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES}) +SET(V3P_NETLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES}) +SET(VCL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES}) +SET(VNL_ALGO_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES}) +SET(VNL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES}) +SET(TESTLIB_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES}) + + + 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 =================================================================== --- vxl-1.17.0.orig/v3p/netlib/CMakeLists.txt 2012-12-28 22:37:41.527500320 +0100 +++ vxl-1.17.0/v3p/netlib/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -8,6 +8,7 @@ ) ADD_LIBRARY( netlib ${netlib_sources} ) +SET_TARGET_PROPERTIES(netlib PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS( /lib netlib ) INSTALL_FILES( /include/vxl/v3p/netlib .h triangle ) @@ -462,6 +463,7 @@ # Create a netlib library with mangled symbols. ADD_LIBRARY(v3p_netlib ${v3p_netlib_sources}) +SET_TARGET_PROPERTIES(v3p_netlib PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/rpl/rsdl/CMakeLists.txt 2012-12-28 22:37:41.791500326 +0100 +++ vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -21,6 +21,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY(rsdl ${rsdl_sources}) +SET_TARGET_PROPERTIES(rsdl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/clsfy/CMakeLists.txt 2012-12-28 22:37:41.915500328 +0100 +++ vxl-1.17.0/contrib/mul/clsfy/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -53,6 +53,7 @@ AUX_SOURCE_DIRECTORY(Templates clsfy_sources) ADD_LIBRARY(clsfy ${clsfy_sources}) +SET_TARGET_PROPERTIES(clsfy PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/vpdfl/CMakeLists.txt 2012-12-28 22:37:41.839500327 +0100 +++ vxl-1.17.0/contrib/mul/vpdfl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -37,6 +37,7 @@ AUX_SOURCE_DIRECTORY(Templates vpdfl_sources) ADD_LIBRARY(vpdfl ${vpdfl_sources}) +SET_TARGET_PROPERTIES(vpdfl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/v3p/Qv/CMakeLists.txt 2012-12-28 22:37:41.535500320 +0100 +++ vxl-1.17.0/v3p/Qv/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -169,6 +169,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY( Qv ${Qv_sources} ) +SET_TARGET_PROPERTIES(Qv PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( Qv vcl ) Index: vxl-1.17.0/contrib/prip/vpyr/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/prip/vpyr/CMakeLists.txt 2012-12-28 22:37:41.827500325 +0100 +++ vxl-1.17.0/contrib/prip/vpyr/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -23,6 +23,7 @@ ) ADD_LIBRARY(vpyr ${vpyr_sources}) +SET_TARGET_PROPERTIES(vpyr PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/core/vgl/algo/CMakeLists.txt 2012-12-28 22:37:42.059500331 +0100 +++ vxl-1.17.0/core/vgl/algo/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -44,6 +44,7 @@ AUX_SOURCE_DIRECTORY(Templates vgl_algo_sources) ADD_LIBRARY(vgl_algo ${vgl_algo_sources}) +SET_TARGET_PROPERTIES(vgl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bgrl/CMakeLists.txt 2012-12-28 22:37:41.679500323 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bgrl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -19,6 +19,7 @@ AUX_SOURCE_DIRECTORY(Templates bgrl_sources) ADD_LIBRARY(bgrl ${bgrl_sources}) +SET_TARGET_PROPERTIES(bgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bgrl2/CMakeLists.txt 2012-12-28 22:37:41.639500322 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bgrl2/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -17,7 +17,9 @@ ) ADD_LIBRARY(bgrl2 ${bgrl2_sources}) - +SET_TARGET_PROPERTIES(bgrl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bgrl2) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bgrl2 ${bgrl2_sources}) TARGET_LINK_LIBRARIES( bgrl2 vbl ) #Algorithms on graphs Index: vxl-1.17.0/contrib/gel/vdgl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/gel/vdgl/CMakeLists.txt 2012-12-28 22:37:41.975500330 +0100 +++ vxl-1.17.0/contrib/gel/vdgl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -23,6 +23,7 @@ AUX_SOURCE_DIRECTORY(Templates vdgl_sources) ADD_LIBRARY(vdgl ${vdgl_sources}) +SET_TARGET_PROPERTIES(vdgl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/vtol/algo/CMakeLists.txt 2012-12-28 22:37:41.955500329 +0100 +++ vxl-1.17.0/contrib/gel/vtol/algo/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -8,6 +8,7 @@ AUX_SOURCE_DIRECTORY( Templates vtol_algo_sources ) ADD_LIBRARY( vtol_algo ${vtol_algo_sources} ) +SET_TARGET_PROPERTIES(vtol_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/vtol/CMakeLists.txt 2012-12-28 22:37:41.951500329 +0100 +++ vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -35,6 +35,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY(vtol ${vtol_sources}) +SET_TARGET_PROPERTIES(vtol PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/oxl/mvl/CMakeLists.txt 2012-12-28 22:37:41.539500320 +0100 +++ vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -113,6 +113,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY(mvl ${mvl_sources}) +SET_TARGET_PROPERTIES(mvl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/prip/vdtop/CMakeLists.txt 2012-12-28 22:37:41.815500326 +0100 +++ vxl-1.17.0/contrib/prip/vdtop/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -26,6 +26,7 @@ ) ADD_LIBRARY(vdtop ${vdtop_sources}) +SET_TARGET_PROPERTIES(vdtop PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2012-12-28 22:37:41.575500321 +0100 +++ vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -22,6 +22,8 @@ ENDIF(WIN32) ADD_LIBRARY( minizip ${minizip_sources} ) +SET_TARGET_PROPERTIES(minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS( /lib minizip ) +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 =================================================================== --- vxl-1.17.0.orig/contrib/tbl/vipl/CMakeLists.txt 2012-12-28 22:37:41.811500326 +0100 +++ vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -77,6 +77,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY(vipl ${vipl_sources}) +SET_TARGET_PROPERTIES(vipl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/core/vul/CMakeLists.txt 2012-12-28 22:37:42.107500333 +0100 +++ vxl-1.17.0/core/vul/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -76,6 +76,7 @@ ENDIF(APPLE) +SET_TARGET_PROPERTIES(vul PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vul vcl ) INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vul Index: vxl-1.17.0/contrib/brl/bbas/bdgl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bdgl/CMakeLists.txt 2012-12-28 22:37:41.711500324 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bdgl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -20,6 +20,7 @@ ) ADD_LIBRARY(bdgl ${bdgl_sources}) +SET_TARGET_PROPERTIES(bdgl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bdpg/CMakeLists.txt 2012-12-28 22:37:41.715500324 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bdpg/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -10,6 +10,7 @@ AUX_SOURCE_DIRECTORY(Templates bdpg_sources) ADD_LIBRARY(bdpg ${bdpg_sources}) +SET_TARGET_PROPERTIES(bdpg PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bgui/CMakeLists.txt 2012-12-28 22:37:41.655500323 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bgui/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -38,6 +38,7 @@ AUX_SOURCE_DIRECTORY(Templates bgui_sources) ADD_LIBRARY(bgui ${bgui_sources}) + SET_TARGET_PROPERTIES(bgui PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bgui3d/CMakeLists.txt 2012-12-28 22:37:41.599500320 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bgui3d/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -60,6 +60,7 @@ ) ADD_LIBRARY(bgui3d ${bgui3d_sources}) +SET_TARGET_PROPERTIES(bgui3d PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bil/algo/CMakeLists.txt 2012-12-28 22:37:41.635500322 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bil/algo/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -31,6 +31,9 @@ AUX_SOURCE_DIRECTORY(Templates bil_algo_sources) ADD_LIBRARY( bil_algo ${bil_algo_sources} ) +SET_TARGET_PROPERTIES(bil_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bil_algo) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bil/algo ${bil_algo_sources}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bil/CMakeLists.txt 2012-12-28 22:37:41.627500322 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bil/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -11,6 +11,9 @@ AUX_SOURCE_DIRECTORY(Templates bil_sources) ADD_LIBRARY(bil ${bil_sources}) +SET_TARGET_PROPERTIES(bil PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bil) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bil ${bil_sources}) TARGET_LINK_LIBRARIES(bil vil vil_io vsl vidl) Index: vxl-1.17.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2012-12-28 22:37:41.691500322 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -13,6 +13,9 @@ ) ADD_LIBRARY( bmsh3d_algo ${bmsh3d_algo_sources}) +SET_TARGET_PROPERTIES(bmsh3d_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bmsh3d_algo) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bmsh3d/algo ${bmsh3d_algo_sources}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2012-12-28 22:37:41.591500321 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bnl/algo/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -5,6 +5,7 @@ ) ADD_LIBRARY( bnl_algo ${bnl_algo_sources} ) +SET_TARGET_PROPERTIES(bnl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bnl/CMakeLists.txt 2012-12-28 22:37:41.587500321 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bnl/CMakeLists.txt 2012-12-28 22:37:47.535500452 +0100 @@ -8,6 +8,7 @@ ) ADD_LIBRARY(bnl ${bnl_sources}) +SET_TARGET_PROPERTIES(bnl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bsol/CMakeLists.txt 2012-12-28 22:37:41.603500321 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bsol/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -24,6 +24,7 @@ AUX_SOURCE_DIRECTORY(Templates bsol_sources) ADD_LIBRARY(bsol ${bsol_sources}) +SET_TARGET_PROPERTIES(bsol PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bsta/CMakeLists.txt 2012-12-28 22:37:41.667500323 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bsta/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -62,6 +62,7 @@ AUX_SOURCE_DIRECTORY(Templates bsta_sources) ADD_LIBRARY(bsta ${bsta_sources}) +SET_TARGET_PROPERTIES(bsta PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2012-12-28 22:37:41.675500323 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bsta/vis/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -8,6 +8,9 @@ ) ADD_LIBRARY( bsta_vis ${bsta_vis_sources} ) +SET_TARGET_PROPERTIES(bsta_vis PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bsta_vis) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bsta/vis ${bsta_vis_sources}) TARGET_LINK_LIBRARIES( bsta_vis bsta bsvg vnl ) Index: vxl-1.17.0/contrib/brl/bbas/btol/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/btol/CMakeLists.txt 2012-12-28 22:37:41.695500323 +0100 +++ vxl-1.17.0/contrib/brl/bbas/btol/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -19,6 +19,7 @@ ) ADD_LIBRARY(btol ${btol_sources}) +SET_TARGET_PROPERTIES(btol PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bugl/CMakeLists.txt 2012-12-28 22:37:41.643500322 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bugl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -26,6 +26,7 @@ AUX_SOURCE_DIRECTORY(Templates bugl_sources) ADD_LIBRARY(bugl ${bugl_sources}) +SET_TARGET_PROPERTIES(bugl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-12-28 22:37:41.623500322 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bvgl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -38,6 +38,7 @@ #Create BVGL library ADD_LIBRARY(bvgl ${bvgl_sources}) +SET_TARGET_PROPERTIES(bvgl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-12-28 22:37:46.159500422 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -31,6 +31,9 @@ ENDIF(ECW_FOUND) ADD_LIBRARY(bwm_algo ${bwm_algo_sources}) +SET_TARGET_PROPERTIES(bwm_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bwm_algo) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bwm/algo ${bwm_algo}) 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 shp ) Index: vxl-1.17.0/contrib/brl/bbas/bxml/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bxml/CMakeLists.txt 2012-12-28 22:37:41.611500322 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bxml/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -27,6 +27,9 @@ AUX_SOURCE_DIRECTORY(Templates bxml_sources) ADD_LIBRARY(bxml ${bxml_sources}) +SET_TARGET_PROPERTIES(bxml PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bxml) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bxml ${bxml_sources}) TARGET_LINK_LIBRARIES( bxml vbl_io vul vbl ) IF(EXPAT_FOUND) Index: vxl-1.17.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2012-12-28 22:37:41.703500324 +0100 +++ vxl-1.17.0/contrib/brl/bbas/imesh/algo/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -23,6 +23,9 @@ ENDIF (NETLIB_FOUND) ADD_LIBRARY( imesh_algo ${imesh_algo_sources} ) +SET_TARGET_PROPERTIES(imesh_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib imesh_algo) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/imesh/algo ${imesh_algo_sources}) IF(NETLIB_FOUND) 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-12-28 22:37:41.555500319 +0100 +++ vxl-1.17.0/contrib/brl/bpro/core/bvgl_pro/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -14,6 +14,9 @@ AUX_SOURCE_DIRECTORY(processes bvgl_pro_sources) ADD_LIBRARY(bvgl_pro ${bvgl_pro_sources}) +SET_TARGET_PROPERTIES(bvgl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bvgl_pro) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/bvgl_pro ${bvgl_pro_sources}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-12-28 22:37:41.563500321 +0100 +++ vxl-1.17.0/contrib/brl/bpro/core/vil_pro/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -16,6 +16,9 @@ AUX_SOURCE_DIRECTORY(processes vil_pro_sources) ADD_LIBRARY(vil_pro ${vil_pro_sources}) +SET_TARGET_PROPERTIES(vil_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib vil_pro) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/core/vil_pro ${vil_pro_sources}) TARGET_LINK_LIBRARIES(vil_pro bbas_pro bprb bil bil_algo brip vil_algo vil_io vil vnl vul vsl) Index: vxl-1.17.0/contrib/brl/bseg/bmdl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/CMakeLists.txt 2012-12-28 22:37:41.727500324 +0100 +++ vxl-1.17.0/contrib/brl/bseg/bmdl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -16,6 +16,9 @@ AUX_SOURCE_DIRECTORY(Templates bmdl_sources) ADD_LIBRARY(bmdl ${bmdl_sources}) +SET_TARGET_PROPERTIES(bmdl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bmdl) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl ${bmdl_sources}) TARGET_LINK_LIBRARIES(bmdl vil_algo imesh vgl_algo vgl vnl vil) Index: vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-12-28 22:37:41.731500324 +0100 +++ vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -31,6 +31,9 @@ AUX_SOURCE_DIRECTORY(processes bmdl_pro_sources) ADD_LIBRARY(bmdl_pro ${bmdl_pro_sources}) + SET_TARGET_PROPERTIES(bmdl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + INSTALL_TARGETS(/lib bmdl_pro) + INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl/pro ${bmdl_pro_sources}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-12-28 22:37:41.755500325 +0100 +++ vxl-1.17.0/contrib/brl/bseg/boxm/algo/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -20,6 +20,9 @@ ) ADD_LIBRARY(boxm_algo ${boxm_algo_sources}) +SET_TARGET_PROPERTIES(boxm_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib boxm_algo) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boxm/algo ${boxm_algo_sources}) IF( BUILD_TESTING ) SUBDIRS(tests) Index: vxl-1.17.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-12-28 22:37:41.763500325 +0100 +++ vxl-1.17.0/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -19,6 +19,9 @@ AUX_SOURCE_DIRECTORY(processes boxm_algo_pro_sources) ADD_LIBRARY(boxm_algo_pro ${boxm_algo_pro_sources} ) + SET_TARGET_PROPERTIES(boxm_algo_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + INSTALL_TARGETS(/lib boxm_algo_pro) + INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boxm/algo/pro ${boxm_algo_pro_sources}) 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 > Index: vxl-1.17.0/contrib/brl/bseg/brip/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/brip/CMakeLists.txt 2012-12-28 22:37:41.723500324 +0100 +++ vxl-1.17.0/contrib/brl/bseg/brip/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -40,6 +40,7 @@ AUX_SOURCE_DIRECTORY(Templates brip_sources) ADD_LIBRARY(brip ${brip_sources}) +SET_TARGET_PROPERTIES(brip PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/bvpl/CMakeLists.txt 2012-12-28 22:37:41.767500325 +0100 +++ vxl-1.17.0/contrib/brl/bseg/bvpl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -19,6 +19,9 @@ AUX_SOURCE_DIRECTORY(Templates bvpl_sources) ADD_LIBRARY(bvpl ${bvpl_sources}) +SET_TARGET_PROPERTIES(bvpl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bvpl) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvpl ${bvpl_sources}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2012-12-28 22:37:41.739500324 +0100 +++ vxl-1.17.0/contrib/brl/bseg/bvxm/algo/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -12,6 +12,9 @@ AUX_SOURCE_DIRECTORY(Templates bvxm_algo_sources) ADD_LIBRARY( bvxm_algo ${bvxm_algo_sources}) +SET_TARGET_PROPERTIES(bvxm_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bvxm_algo) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bvxm/algo ${bgrl_sources}) TARGET_LINK_LIBRARIES( bvxm_algo bsta bvxm_grid_io boxm_util vnl vgl) Index: vxl-1.17.0/contrib/brl/bseg/sdet/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/sdet/CMakeLists.txt 2012-12-28 22:37:41.743500325 +0100 +++ vxl-1.17.0/contrib/brl/bseg/sdet/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -55,6 +55,7 @@ AUX_SOURCE_DIRECTORY(Templates sdet_sources) ADD_LIBRARY(sdet ${sdet_sources}) +SET_TARGET_PROPERTIES(sdet PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/segv/CMakeLists.txt 2012-12-28 22:37:41.751500325 +0100 +++ vxl-1.17.0/contrib/brl/bseg/segv/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -33,6 +33,7 @@ ) ADD_LIBRARY(segv ${segv_sources}) +SET_TARGET_PROPERTIES(segv PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/geml/CMakeLists.txt 2012-12-28 22:37:41.979500330 +0100 +++ vxl-1.17.0/contrib/gel/geml/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -12,6 +12,7 @@ ) ADD_LIBRARY(geml ${geml_sources}) +SET_TARGET_PROPERTIES(geml PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/gevd/CMakeLists.txt 2012-12-28 22:37:42.003500330 +0100 +++ vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -33,6 +33,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY(gevd ${gevd_sources}) +SET_TARGET_PROPERTIES(gevd PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/gkll/CMakeLists.txt 2012-12-28 22:37:42.019500331 +0100 +++ vxl-1.17.0/contrib/gel/gkll/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -20,6 +20,7 @@ ENDIF(BUILD_OXL) ADD_LIBRARY(gkll ${gkll_sources}) +SET_TARGET_PROPERTIES(gkll PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/gmvl/CMakeLists.txt 2012-12-28 22:37:41.991500330 +0100 +++ vxl-1.17.0/contrib/gel/gmvl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -21,6 +21,7 @@ AUX_SOURCE_DIRECTORY(Templates gmvl_sources) ADD_LIBRARY(gmvl ${gmvl_sources}) +SET_TARGET_PROPERTIES(gmvl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/gst/CMakeLists.txt 2012-12-28 22:37:41.943500329 +0100 +++ vxl-1.17.0/contrib/gel/gst/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -17,6 +17,7 @@ AUX_SOURCE_DIRECTORY(Templates gst_sources) ADD_LIBRARY(gst ${gst_sources}) +SET_TARGET_PROPERTIES(gst PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/gtrl/CMakeLists.txt 2012-12-28 22:37:41.983500330 +0100 +++ vxl-1.17.0/contrib/gel/gtrl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -25,6 +25,7 @@ ENDIF(NETLIB_FOUND) ADD_LIBRARY(gtrl ${gtrl_sources}) +SET_TARGET_PROPERTIES(gtrl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/vgel/CMakeLists.txt 2012-12-28 22:37:42.007500329 +0100 +++ vxl-1.17.0/contrib/gel/vgel/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -20,6 +20,7 @@ ENDIF(BUILD_OXL) ADD_LIBRARY(vgel ${vgel_sources}) +SET_TARGET_PROPERTIES(vgel PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/vgel/kl/CMakeLists.txt 2012-12-28 22:37:42.015500331 +0100 +++ vxl-1.17.0/contrib/gel/vgel/kl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -15,6 +15,7 @@ ) ADD_LIBRARY(vgel_kl ${vgel_kl_sources}) +SET_TARGET_PROPERTIES(vgel_kl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/vifa/CMakeLists.txt 2012-12-28 22:37:41.963500328 +0100 +++ vxl-1.17.0/contrib/gel/vifa/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -31,6 +31,7 @@ AUX_SOURCE_DIRECTORY(Templates vifa_sources) ADD_LIBRARY(vifa ${vifa_sources}) +SET_TARGET_PROPERTIES(vifa PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/vmal/CMakeLists.txt 2012-12-28 22:37:41.967500329 +0100 +++ vxl-1.17.0/contrib/gel/vmal/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100 @@ -37,11 +37,12 @@ ADD_LIBRARY(vmal ${vmal_sources}) +SET_TARGET_PROPERTIES(vmal PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib vmal) INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/vmal ${vmal_sources}) IF(BUILD_OXL) - TARGET_LINK_LIBRARIES(vmal mvl osl vil) + TARGET_LINK_LIBRARIES(vmal mvl oxl_osl vil) ENDIF(BUILD_OXL) IF (BUILD_UNMAINTAINED_LIBRARIES OR BUILD_FOR_VXL_DASHBOARD) Index: vxl-1.17.0/contrib/gel/vsol/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/gel/vsol/CMakeLists.txt 2012-12-28 22:37:41.995500330 +0100 +++ vxl-1.17.0/contrib/gel/vsol/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -63,6 +63,7 @@ AUX_SOURCE_DIRECTORY(Templates vsol_sources) ADD_LIBRARY(vsol ${vsol_sources}) +SET_TARGET_PROPERTIES(vsol PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/gel/vsrl/CMakeLists.txt 2012-12-28 22:37:41.939500329 +0100 +++ vxl-1.17.0/contrib/gel/vsrl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -60,6 +60,7 @@ ENDIF (HAS_VGUI) ADD_LIBRARY(vsrl ${vsrl_sources}) +SET_TARGET_PROPERTIES(vsrl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/ipts/CMakeLists.txt 2012-12-28 22:37:41.863500327 +0100 +++ vxl-1.17.0/contrib/mul/ipts/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -16,6 +16,7 @@ ) ADD_LIBRARY(ipts ${ipts_sources}) +SET_TARGET_PROPERTIES(ipts PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/mbl/CMakeLists.txt 2012-12-28 22:37:41.867500327 +0100 +++ vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -121,6 +121,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY(mbl ${mbl_sources}) +SET_TARGET_PROPERTIES(mbl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/mil/algo/CMakeLists.txt 2012-12-28 22:37:41.895500328 +0100 +++ vxl-1.17.0/contrib/mul/mil/algo/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -15,6 +15,7 @@ AUX_SOURCE_DIRECTORY(Templates mil_algo_sources) ADD_LIBRARY(mil_algo ${mil_algo_sources}) +SET_TARGET_PROPERTIES(mil_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/mil/CMakeLists.txt 2012-12-28 22:37:41.891500328 +0100 +++ vxl-1.17.0/contrib/mul/mil/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -37,6 +37,7 @@ AUX_SOURCE_DIRECTORY(Templates mil_sources) ADD_LIBRARY(mil ${mil_sources}) +SET_TARGET_PROPERTIES(mil PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/mil3d/CMakeLists.txt 2012-12-28 22:37:41.907500328 +0100 +++ vxl-1.17.0/contrib/mul/mil3d/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -20,6 +20,7 @@ AUX_SOURCE_DIRECTORY(Templates mil3d_sources) ADD_LIBRARY(mil3d ${mil3d_sources}) +SET_TARGET_PROPERTIES(mil3d PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/mvl2/CMakeLists.txt 2012-12-28 22:37:41.887500328 +0100 +++ vxl-1.17.0/contrib/mul/mvl2/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -52,6 +52,7 @@ ENDIF (AVIFILE_FOUND) ADD_LIBRARY(mvl2 ${mvl2_sources}) +SET_TARGET_PROPERTIES(mvl2 PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/pdf1d/CMakeLists.txt 2012-12-28 22:37:41.903500328 +0100 +++ vxl-1.17.0/contrib/mul/pdf1d/CMakeLists.txt 2012-12-28 22:37:47.539500452 +0100 @@ -49,6 +49,7 @@ AUX_SOURCE_DIRECTORY(Templates pdf1d_sources) ADD_LIBRARY(pdf1d ${pdf1d_sources}) +SET_TARGET_PROPERTIES(pdf1d PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/vil3d/algo/CMakeLists.txt 2012-12-28 22:37:41.855500327 +0100 +++ vxl-1.17.0/contrib/mul/vil3d/algo/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -36,6 +36,7 @@ AUX_SOURCE_DIRECTORY(Templates vil3d_algo_sources) ADD_LIBRARY(vil3d_algo ${vil3d_algo_sources}) +SET_TARGET_PROPERTIES(vil3d_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/vil3d/CMakeLists.txt 2012-12-28 22:37:41.843500327 +0100 +++ vxl-1.17.0/contrib/mul/vil3d/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -49,6 +49,7 @@ AUX_SOURCE_DIRECTORY(Templates vil3d_sources) ADD_LIBRARY(vil3d ${vil3d_sources}) +SET_TARGET_PROPERTIES(vil3d PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vil3d vil vul vsl vcl vnl ) INSTALL_TARGETS(/lib vil3d) Index: vxl-1.17.0/contrib/mul/vil3d/io/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/mul/vil3d/io/CMakeLists.txt 2012-12-28 22:37:41.851500327 +0100 +++ vxl-1.17.0/contrib/mul/vil3d/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -7,6 +7,7 @@ ) ADD_LIBRARY(vil3d_io ${vil3d_io_sources}) +SET_TARGET_PROPERTIES(vil3d_io PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/vimt/algo/CMakeLists.txt 2012-12-28 22:37:41.879500328 +0100 +++ vxl-1.17.0/contrib/mul/vimt/algo/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -11,6 +11,7 @@ ) ADD_LIBRARY(vimt_algo ${vimt_algo_sources}) +SET_TARGET_PROPERTIES(vimt_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/vimt/CMakeLists.txt 2012-12-28 22:37:41.875500327 +0100 +++ vxl-1.17.0/contrib/mul/vimt/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -35,6 +35,7 @@ AUX_SOURCE_DIRECTORY(Templates vimt_sources) ADD_LIBRARY(vimt ${vimt_sources}) +SET_TARGET_PROPERTIES(vimt PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/mul/vimt3d/CMakeLists.txt 2012-12-28 22:37:41.835500327 +0100 +++ vxl-1.17.0/contrib/mul/vimt3d/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -34,6 +34,7 @@ AUX_SOURCE_DIRECTORY(Templates vimt3d_sources) ADD_LIBRARY(vimt3d ${vimt3d_sources}) +SET_TARGET_PROPERTIES(vimt3d PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/oul/ouel/CMakeLists.txt 2012-12-28 22:37:41.919500327 +0100 +++ vxl-1.17.0/contrib/oul/ouel/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -11,6 +11,7 @@ ) ADD_LIBRARY(ouel ${ouel_sources}) +SET_TARGET_PROPERTIES(ouel PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/oul/oufgl/CMakeLists.txt 2012-12-28 22:37:41.931500329 +0100 +++ vxl-1.17.0/contrib/oul/oufgl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -15,6 +15,7 @@ ) ADD_LIBRARY(oufgl ${oufgl_sources}) +SET_TARGET_PROPERTIES(oufgl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/oul/ouml/CMakeLists.txt 2012-12-28 22:37:41.927500329 +0100 +++ vxl-1.17.0/contrib/oul/ouml/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -20,6 +20,7 @@ ) ADD_LIBRARY(ouml ${ouml_sources}) +SET_TARGET_PROPERTIES(ouml PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/oxl/osl/CMakeLists.txt 2012-12-28 22:37:41.543500320 +0100 +++ vxl-1.17.0/contrib/oxl/osl/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100 @@ -44,10 +44,11 @@ ) AUX_SOURCE_DIRECTORY(Templates osl_sources) -ADD_LIBRARY(osl ${osl_sources}) -INSTALL_TARGETS(/lib osl) +ADD_LIBRARY(oxl_osl ${osl_sources}) +SET_TARGET_PROPERTIES(oxl_osl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib oxl_osl) INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/oxl/osl ${osl_sources}) -TARGET_LINK_LIBRARIES(osl vnl_algo vnl vgl vil1 vbl) +TARGET_LINK_LIBRARIES(oxl_osl vnl_algo vnl vgl vil1 vbl) IF (BUILD_EXAMPLES) SUBDIRS(examples) Index: vxl-1.17.0/contrib/prip/vmap/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/prip/vmap/CMakeLists.txt 2012-12-28 22:37:41.823500326 +0100 +++ vxl-1.17.0/contrib/prip/vmap/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -28,6 +28,7 @@ ) ADD_LIBRARY(vmap ${vmap_sources}) +SET_TARGET_PROPERTIES(vmap PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/rpl/rgrl/CMakeLists.txt 2012-12-28 22:37:41.779500325 +0100 +++ vxl-1.17.0/contrib/rpl/rgrl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -161,6 +161,7 @@ AUX_SOURCE_DIRECTORY( Templates rgrl_sources ) ADD_LIBRARY( rgrl ${rgrl_sources} ) +SET_TARGET_PROPERTIES(rgrl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/contrib/rpl/rgtl/CMakeLists.txt 2012-12-28 22:37:41.799500326 +0100 +++ vxl-1.17.0/contrib/rpl/rgtl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -84,6 +84,7 @@ ) ADD_LIBRARY(rgtl ${rgtl_sources}) +SET_TARGET_PROPERTIES(rgtl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(rgtl vnl_algo vnl vcl) INSTALL_TARGETS(/lib rgtl) Index: vxl-1.17.0/contrib/rpl/rtvl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/rpl/rtvl/CMakeLists.txt 2012-12-28 22:37:41.787500325 +0100 +++ vxl-1.17.0/contrib/rpl/rtvl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -41,6 +41,7 @@ ) ADD_LIBRARY(rtvl ${rtvl_sources}) +SET_TARGET_PROPERTIES(rtvl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(rtvl rgtl vnl_algo vnl) INSTALL_TARGETS(/lib rtvl) Index: vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/tbl/vepl/CMakeLists.txt 2012-12-28 22:37:41.803500326 +0100 +++ vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -52,6 +52,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY(vepl ${vepl_sources}) +SET_TARGET_PROPERTIES(vepl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/core/testlib/CMakeLists.txt 2012-12-28 22:37:42.095500332 +0100 +++ vxl-1.17.0/core/testlib/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -29,6 +29,7 @@ ) ADD_LIBRARY( testlib ${testlib_sources} ) +SET_TARGET_PROPERTIES(testlib PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/core/vbl/CMakeLists.txt 2012-12-28 22:37:42.119500333 +0100 +++ vxl-1.17.0/core/vbl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -42,6 +42,7 @@ AUX_SOURCE_DIRECTORY(Templates vbl_sources) ADD_LIBRARY(vbl ${vbl_sources}) +SET_TARGET_PROPERTIES(vbl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vbl vcl ) INSTALL_TARGETS(/lib vbl) Index: vxl-1.17.0/core/vbl/io/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vbl/io/CMakeLists.txt 2012-12-28 22:37:42.123500333 +0100 +++ vxl-1.17.0/core/vbl/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -17,6 +17,7 @@ AUX_SOURCE_DIRECTORY(Templates vbl_io_sources) ADD_LIBRARY(vbl_io ${vbl_io_sources}) +SET_TARGET_PROPERTIES(vbl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vbl_io vbl vsl ) INSTALL_TARGETS(/lib vbl_io) Index: vxl-1.17.0/core/vcsl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vcsl/CMakeLists.txt 2012-12-28 22:37:42.099500331 +0100 +++ vxl-1.17.0/core/vcsl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -63,6 +63,7 @@ AUX_SOURCE_DIRECTORY( Templates vcsl_sources ) ADD_LIBRARY( vcsl ${vcsl_sources} ) + SET_TARGET_PROPERTIES(vcsl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vcsl vnl vbl ) INSTALL_TARGETS(/lib vcsl) Index: vxl-1.17.0/core/vgl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vgl/CMakeLists.txt 2012-12-28 22:37:42.047500331 +0100 +++ vxl-1.17.0/core/vgl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -69,6 +69,7 @@ AUX_SOURCE_DIRECTORY(Templates vgl_sources) ADD_LIBRARY(vgl ${vgl_sources}) +SET_TARGET_PROPERTIES(vgl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/core/vgl/io/CMakeLists.txt 2012-12-28 22:37:42.055500330 +0100 +++ vxl-1.17.0/core/vgl/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -29,6 +29,7 @@ AUX_SOURCE_DIRECTORY(Templates vgl_io_sources) ADD_LIBRARY(vgl_io ${vgl_io_sources}) +SET_TARGET_PROPERTIES(vgl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vgl_io vgl vsl ) INSTALL_TARGETS(/lib vgl_io) Index: vxl-1.17.0/core/vgui/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vgui/CMakeLists.txt 2012-12-28 22:37:42.083500332 +0100 +++ vxl-1.17.0/core/vgui/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -518,6 +518,7 @@ ) ADD_LIBRARY(vgui ${vgui_sources}) +SET_TARGET_PROPERTIES(vgui PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/core/vgui/wx/CMakeLists.txt 2012-12-28 22:37:42.091500332 +0100 +++ vxl-1.17.0/core/vgui/wx/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -24,6 +24,7 @@ ) ADD_LIBRARY(vgui_wx ${vgui_wx_sources}) +SET_TARGET_PROPERTIES(vgui_wx PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(vgui_wx vgui ${wxWidgets_LIBRARIES}) IF (BUILD_TESTING) Index: vxl-1.17.0/core/vidl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vidl/CMakeLists.txt 2012-12-28 22:37:42.031500331 +0100 +++ vxl-1.17.0/core/vidl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -128,6 +128,7 @@ AUX_SOURCE_DIRECTORY(Templates vidl_sources) ADD_LIBRARY(vidl ${vidl_sources}) +SET_TARGET_PROPERTIES(vidl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib vidl) INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vidl ${vidl_sources}) Index: vxl-1.17.0/core/vidl/gui/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vidl/gui/CMakeLists.txt 2012-12-28 22:37:42.039500331 +0100 +++ vxl-1.17.0/core/vidl/gui/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -12,6 +12,7 @@ ) ADD_LIBRARY(vidl_gui ${vidl_gui_sources}) +SET_TARGET_PROPERTIES(vidl_gui PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/core/vil/algo/CMakeLists.txt 2012-12-28 22:37:42.143500332 +0100 +++ vxl-1.17.0/core/vil/algo/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -57,6 +57,7 @@ AUX_SOURCE_DIRECTORY(Templates vil_algo_sources) ADD_LIBRARY(vil_algo ${vil_algo_sources}) +SET_TARGET_PROPERTIES(vil_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vil_algo vil vnl_algo vnl vcl ) Index: vxl-1.17.0/core/vil/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vil/CMakeLists.txt 2012-12-28 22:37:42.131500333 +0100 +++ vxl-1.17.0/core/vil/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -340,6 +340,7 @@ TARGET_LINK_LIBRARIES( vil nsl vil_network socket ) ENDIF (SOLARIS) +SET_TARGET_PROPERTIES(vil PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil ${vil_sources} ${vil_network_sources} Index: vxl-1.17.0/core/vil/io/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vil/io/CMakeLists.txt 2012-12-28 22:37:42.135500333 +0100 +++ vxl-1.17.0/core/vil/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -15,6 +15,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY(vil_io ${vil_io_sources}) +SET_TARGET_PROPERTIES(vil_io PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vil_io vil vsl ) INSTALL_TARGETS(/lib vil_io) Index: vxl-1.17.0/core/vil1/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vil1/CMakeLists.txt 2012-12-28 22:37:42.067500332 +0100 +++ vxl-1.17.0/core/vil1/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -169,6 +169,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY(vil1 ${vil1_sources}) +SET_TARGET_PROPERTIES(vil1 PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib vil1) INSTALL_NOBASE_HEADER_FILES(/include/vxl/core/vil1 ${vil1_sources}) Index: vxl-1.17.0/core/vil1/io/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vil1/io/CMakeLists.txt 2012-12-28 22:37:42.071500332 +0100 +++ vxl-1.17.0/core/vil1/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -15,6 +15,7 @@ AUX_SOURCE_DIRECTORY(Templates vil1_io_sources) ADD_LIBRARY(vil1_io ${vil1_io_sources}) +SET_TARGET_PROPERTIES(vil1_io PROPERTIES ${VNL_LIBRARY_PROPERTIES}) 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 =================================================================== --- vxl-1.17.0.orig/core/vnl/algo/CMakeLists.txt 2012-12-28 22:37:42.167500334 +0100 +++ vxl-1.17.0/core/vnl/algo/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -102,6 +102,7 @@ AUX_SOURCE_DIRECTORY(Templates vnl_algo_sources) ADD_LIBRARY( vnl_algo ${vnl_algo_sources}) + SET_TARGET_PROPERTIES(vnl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vnl_algo ${NETLIB_LIBRARIES} vnl ) INSTALL_TARGETS(/lib vnl_algo) Index: vxl-1.17.0/core/vnl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vnl/CMakeLists.txt 2012-12-28 22:37:42.147500333 +0100 +++ vxl-1.17.0/core/vnl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -264,6 +264,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY(vnl ${vnl_sources}) +SET_TARGET_PROPERTIES(vnl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vnl vcl ) INSTALL_TARGETS(/lib vnl) Index: vxl-1.17.0/core/vnl/io/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vnl/io/CMakeLists.txt 2012-12-28 22:37:42.159500334 +0100 +++ vxl-1.17.0/core/vnl/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -26,6 +26,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY(vnl_io ${vnl_io_sources} ) +SET_TARGET_PROPERTIES(vnl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vnl_io vnl vsl ) INSTALL_TARGETS(/lib vnl_io) Index: vxl-1.17.0/core/vnl/xio/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vnl/xio/CMakeLists.txt 2012-12-28 22:37:42.151500334 +0100 +++ vxl-1.17.0/core/vnl/xio/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -11,6 +11,7 @@ AUX_SOURCE_DIRECTORY(Templates vnl_xio_sources) ADD_LIBRARY(vnl_xio ${vnl_xio_sources} ) +SET_TARGET_PROPERTIES(vnl_xio PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vnl_xio vnl vsl ) INSTALL_TARGETS(/lib vnl_xio) Index: vxl-1.17.0/core/vpdl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vpdl/CMakeLists.txt 2012-12-28 22:37:42.079500332 +0100 +++ vxl-1.17.0/core/vpdl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -48,6 +48,7 @@ AUX_SOURCE_DIRECTORY(Templates vpdl_sources) ADD_LIBRARY(vpdl ${vpdl_sources}) +SET_TARGET_PROPERTIES(vpdl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vpdl vnl_algo vnl ) INSTALL_TARGETS(/lib vpdl) Index: vxl-1.17.0/core/vsl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vsl/CMakeLists.txt 2012-12-28 22:37:42.043500331 +0100 +++ vxl-1.17.0/core/vsl/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -36,6 +36,7 @@ AUX_SOURCE_DIRECTORY(Templates vsl_sources) ADD_LIBRARY(vsl ${vsl_sources}) +SET_TARGET_PROPERTIES(vsl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vsl vcl ) INSTALL_TARGETS(/lib vsl) Index: vxl-1.17.0/core/vul/io/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vul/io/CMakeLists.txt 2012-12-28 22:37:42.111500333 +0100 +++ vxl-1.17.0/core/vul/io/CMakeLists.txt 2012-12-28 22:37:47.543500452 +0100 @@ -5,6 +5,7 @@ ) ADD_LIBRARY(vul_io ${vul_io_sources}) +SET_TARGET_PROPERTIES(vul_io PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(vul_io vul vsl) INSTALL_TARGETS(/lib vul_io) Index: vxl-1.17.0/v3p/dcmtk/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/v3p/dcmtk/CMakeLists.txt 2012-12-28 22:37:41.523500320 +0100 +++ vxl-1.17.0/v3p/dcmtk/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100 @@ -453,6 +453,7 @@ TARGET_LINK_LIBRARIES( dcmtk ${ZLIB_LIBRARIES} ) ENDIF( DCMTK_HAVE_ZLIB ) +SET_TARGET_PROPERTIES(dcmtk PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS( /lib dcmtk ) IF( BUILD_TESTING ) Index: vxl-1.17.0/vcl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/vcl/CMakeLists.txt 2012-12-28 22:37:42.027500331 +0100 +++ vxl-1.17.0/vcl/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100 @@ -360,6 +360,7 @@ #AUX_SOURCE_DIRECTORY(Templates vcl_sources) ADD_LIBRARY(vcl ${vcl_sources}) +SET_TARGET_PROPERTIES(vcl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) # 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 =================================================================== --- vxl-1.17.0.orig/contrib/brl/b3p/expatpp/CMakeLists.txt 2012-12-28 22:37:41.583500321 +0100 +++ vxl-1.17.0/contrib/brl/b3p/expatpp/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100 @@ -12,6 +12,9 @@ SET( expatpp_sources expatpp.h expatpp.cpp expatpplib.h ) ADD_LIBRARY( expatpp ${expatpp_sources} ) + SET_TARGET_PROPERTIES( expatpp PROPERTIES ${VNL_LIBRARY_PROPERTIES}) + INSTALL_TARGETS(/lib expatpp) + INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/expatpp ${expatpp_sources}) TARGET_LINK_LIBRARIES( expatpp ${EXPAT_LIBRARIES} ) IF( BUILD_TESTING ) Index: vxl-1.17.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-12-28 22:37:41.615500322 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bxml/bsvg/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100 @@ -12,7 +12,9 @@ AUX_SOURCE_DIRECTORY(Templates bsvg_sources) ADD_LIBRARY(bsvg ${bsvg_sources}) - +SET_TARGET_PROPERTIES( bsvg PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bsvg) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bsvg ${bsvg_sources}) TARGET_LINK_LIBRARIES( bsvg bxml ) IF( BUILD_TESTING ) Index: vxl-1.17.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2012-12-28 22:37:41.683500323 +0100 +++ vxl-1.17.0/contrib/brl/bbas/bmsh3d/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100 @@ -32,7 +32,9 @@ ) ADD_LIBRARY( bmsh3d ${bmsh3d_sources}) - +SET_TARGET_PROPERTIES( bmsh3d PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bmsh3d) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bmsh3d ${bmsh3d_sources}) TARGET_LINK_LIBRARIES( bmsh3d vgl vgl_algo vnl vul) SUBDIRS( algo ) Index: vxl-1.17.0/contrib/brl/bpro/bprb/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bpro/bprb/CMakeLists.txt 2012-12-28 22:37:41.571500321 +0100 +++ vxl-1.17.0/contrib/brl/bpro/bprb/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100 @@ -18,7 +18,9 @@ AUX_SOURCE_DIRECTORY(Templates bprb_sources) ADD_LIBRARY(bprb ${bprb_sources}) - +SET_TARGET_PROPERTIES( bprb PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib bprb) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bpro/bprb ${bprb_sources}) TARGET_LINK_LIBRARIES(bprb brdb bxml vbl vsl) IF(BUILD_TESTING) Index: vxl-1.17.0/contrib/brl/bbas/brdb/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/brdb/CMakeLists.txt 2012-12-28 22:37:41.651500322 +0100 +++ vxl-1.17.0/contrib/brl/bbas/brdb/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100 @@ -15,7 +15,9 @@ AUX_SOURCE_DIRECTORY(Templates brdb_sources) ADD_LIBRARY(brdb ${brdb_sources}) - +SET_TARGET_PROPERTIES( brdb PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib brdb) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/brdb ${brdb_sources}) # brdb should not depend on any library that uses it TARGET_LINK_LIBRARIES(brdb vbl_io vbl vsl) Index: vxl-1.17.0/contrib/brl/bseg/boct/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/boct/CMakeLists.txt 2012-12-28 22:37:41.775500325 +0100 +++ vxl-1.17.0/contrib/brl/bseg/boct/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100 @@ -14,7 +14,9 @@ AUX_SOURCE_DIRECTORY(Templates boct_sources) ADD_LIBRARY(boct ${boct_sources}) - +SET_TARGET_PROPERTIES( boct PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib boct) +INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/boct ${boct_sources}) TARGET_LINK_LIBRARIES(boct vcl vgl vgl_io vnl_io vbl vnl) #tests Index: vxl-1.17.0/contrib/oxl/osl/tests/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/oxl/osl/tests/CMakeLists.txt 2012-12-28 22:37:41.551500320 +0100 +++ vxl-1.17.0/contrib/oxl/osl/tests/CMakeLists.txt 2012-12-28 22:37:47.547500451 +0100 @@ -1,4 +1,4 @@ ADD_EXECUTABLE( osl_test_include test_include.cxx ) -TARGET_LINK_LIBRARIES( osl_test_include osl ) +TARGET_LINK_LIBRARIES( osl_test_include oxl_osl ) ADD_EXECUTABLE( osl_test_template_include test_template_include.cxx ) -TARGET_LINK_LIBRARIES( osl_test_template_include osl ) +TARGET_LINK_LIBRARIES( osl_test_template_include oxl_osl ) debian/patches/bug708358.patch0000644000000000000000000000101612146640464013117 0ustar Description: Fix compilation baio_unix.cxx:36:40: error: 'O_RDONLY' was not declared in this scope Author: Mathieu Malaterre Bug-Debian: http://bugs.debian.org/708358 Forwarded: no --- vxl-1.17.0.orig/contrib/brl/bbas/baio/baio_unix.cxx +++ vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx @@ -13,6 +13,9 @@ #include //includes bzero #include +#include +#include + //: baio_info struct: wrapper for status variables struct baio_info { aiocb my_aiocb; debian/patches/png15.patch0000644000000000000000000000370511751234123012574 0ustar Description: fix build against newer libpng Remove direct access to png_info struct, and use png_get_* functions instead. This is required with newer versions of libpng (1.5 at least) which no longer support directly accessing said struct. Author: Matthew Woehlke Forwarded: not-needed Bug-Debian: http://bugs.debian.org/650570 Origin: upstream, http://vxl.svn.sf.net/viewvc/vxl?view=revision&revision=34802 --- vxl-1.14.0.orig/core/vil/file_formats/vil_png.cxx +++ vxl-1.14.0/core/vil/file_formats/vil_png.cxx @@ -189,15 +189,15 @@ struct vil_png_structures bool alloc_image() { - rows = new png_byte* [info_ptr->height]; + rows = new png_byte* [png_get_image_height(png_ptr, info_ptr)]; if (rows == 0) return ok = problem("couldn't allocate space for image"); unsigned long linesize; if (png_get_bit_depth(png_ptr, info_ptr) == 16) - linesize = 2 * info_ptr->width; + linesize = 2 * png_get_image_width(png_ptr, info_ptr); else - linesize = info_ptr->width; + linesize = png_get_image_width(png_ptr, info_ptr); if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) linesize *= 2; --- vxl-1.14.0.orig/core/vil1/file_formats/vil1_png.cxx +++ vxl-1.14.0/core/vil1/file_formats/vil1_png.cxx @@ -181,15 +181,15 @@ struct vil1_png_structures bool alloc_image() { - rows = new png_byte* [info_ptr->height]; + rows = new png_byte* [png_get_image_height(png_ptr, info_ptr)]; if (rows == 0) return ok = problem("couldn't allocate space for image"); unsigned long linesize; if (png_get_bit_depth( png_ptr, info_ptr ) == 16) - linesize = 2 * info_ptr->width; + linesize = 2 * png_get_image_width(png_ptr, info_ptr); else - linesize = info_ptr->width; + linesize = png_get_image_width(png_ptr, info_ptr); if (png_get_color_type( png_ptr, info_ptr ) == PNG_COLOR_TYPE_GRAY_ALPHA) linesize *= 2; debian/patches/ocl_comp.patch0000644000000000000000000000467412151075406013445 0ustar Description: Fix underlinking when opencl option is ON Author: Mathieu Malaterre Forwarded: no Index: vxl-1.17.0/contrib/brl/bseg/boxm2_multi/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2_multi/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200 +++ vxl-1.17.0/contrib/brl/bseg/boxm2_multi/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200 @@ -20,6 +20,7 @@ ADD_LIBRARY(boxm2_multi ${boxm2_multi_sources}) TARGET_LINK_LIBRARIES(boxm2_multi boxm2) +TARGET_LINK_LIBRARIES(boxm2_multi boxm2_ocl) #multi gpu implementations SUBDIRS(algo) Index: vxl-1.17.0/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200 +++ vxl-1.17.0/contrib/brl/bseg/boxm2_multi/algo/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200 @@ -15,6 +15,7 @@ ADD_LIBRARY(boxm2_multi_algo ${boxm2_multi_algo_sources}) TARGET_LINK_LIBRARIES(boxm2_multi_algo boxm2_multi)# boxm2_ocl boxm2_ocl_pro boct brdb bsta vbl_io vpgl_algo vpgl vgl_xio vgl vnl_algo vnl vbl vil vul vsl vcl) +TARGET_LINK_LIBRARIES(boxm2_multi_algo boxm2_ocl_algo ) IF( BUILD_TESTING ) SUBDIRS(tests) Index: vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200 +++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200 @@ -28,6 +28,7 @@ ADD_LIBRARY(boxm2_ocl_pro ${boxm2_ocl_pro_sources}) TARGET_LINK_LIBRARIES(boxm2_ocl_pro boxm2_ocl_algo boct brdb vbl_io expatpp vpgl vgl vgl_xio vil vul vbl vsl vcl bvpl_kernels) +TARGET_LINK_LIBRARIES(boxm2_ocl_pro bsta_algo) #tests IF( BUILD_TESTING ) Index: vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200 +++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/tests/CMakeLists.txt 2013-05-28 10:00:46.000000000 +0200 @@ -11,3 +11,4 @@ ADD_EXECUTABLE( boxm2_ocl_pro_test_include test_include.cxx ) TARGET_LINK_LIBRARIES( boxm2_ocl_pro_test_include boxm2_ocl ) +TARGET_LINK_LIBRARIES( boxm2_ocl_pro_test_include bsta_algo) debian/patches/gcc47other.patch0000644000000000000000000010460111770051325013612 0ustar http://vxl.svn.sourceforge.net/viewvc/vxl/trunk/core/vpdl/vpdl_kernel_base.h?r1=27232&r2=29123 http://vxl.svn.sourceforge.net/viewvc/vxl?view=revision&revision=29021 http://vxl.svn.sourceforge.net/viewvc/vxl?view=revision&revision=32325 --- vxl-1.14.0.orig/core/vpdl/vpdl_kernel_base.h +++ vxl-1.14.0/core/vpdl/vpdl_kernel_base.h @@ -13,6 +13,7 @@ // \endverbatim #include +#include // function vpdt_size(v) #include #include --- vxl-1.14.0.orig/core/vpdl/vpdt/vpdt_update_mog.h +++ vxl-1.14.0/core/vpdl/vpdt/vpdt_update_mog.h @@ -124,7 +124,7 @@ class vpdt_mog_sg_updater : public vpdt_ void update( mog_type& mix, const F& sample, T alpha ) const { T sqr_dist; - unsigned int i = match(mix,sample,gt2_,sqr_dist); + unsigned int i = vpdt_mog_updater::match(mix,sample,gt2_,sqr_dist); if (i::insert(mix,sample,init_weight_); } mix.sort(vpdt_mog_fitness::order); } --- vxl-1.14.0.orig/core/vidl/vidl_v4l2_device.cxx +++ vxl-1.14.0/core/vidl/vidl_v4l2_device.cxx @@ -19,6 +19,7 @@ extern "C" { #include #include }; +#include #include #include --- vxl-1.14.0.orig/core/examples/vnl_calc/vnl_calc.cxx +++ vxl-1.14.0/core/examples/vnl_calc/vnl_calc.cxx @@ -33,7 +33,7 @@ template class mystack : public vcl_vector { public: - void push(const T& t) { push_back(t); } + void push(const T& t) { vcl_vector::push_back(t); } T pop() { int n = this->size(); @@ -102,51 +102,53 @@ int main(int argc, char ** argv) } else if (arg == "+") { POP2(a+b); - } else if (arg == "-") { + } + else if (arg == "-") { POP2(a-b); - } else if (arg == "*" || arg == "x") { + } + else if (arg == "*" || arg == "x") { POP2(a*b); - } else if (arg == "/") { - + } + else if (arg == "/") { POP2(element_quotient(a,b)); - - } else if (arg == "svd") { + } + else if (arg == "svd") { Matrix a = stack.pop(); vnl_svd svd(a); stack.push(svd.U()); stack.push(svd.W().asMatrix()); stack.push(svd.V()); - - } else if (arg == "X" || arg == "allx") { + } + else if (arg == "X" || arg == "allx") { // Multiply everything Matrix out = stack[0]; for (unsigned k = 1; k < stack.size(); ++k) out = out * stack[k]; stack.clear(); stack.push(out); - - } else if (arg == "all+") { + } + else if (arg == "all+") { // Add everything Matrix out = stack[0]; for (unsigned k = 1; k < stack.size(); ++k) out += stack[k]; stack.clear(); stack.push(out); - - } else if (arg == "i") { + } + else if (arg == "i") { stack.push(vnl_svd(stack.pop()).inverse()); - - // Printing: - } else if (arg == "p") { + } + // Printing: + else if (arg == "p") { //stack.print(); print(stack, print_format); - - } else if (arg == "fmt") { + } + else if (arg == "fmt") { SHIFT; //Matrix::set_print_format(arg.c_str()); print_format = arg; - - } else if (arg == "setp") { + } + else if (arg == "setp") { Matrix a = stack.pop(); cout_precision = int(a(0,0)); if (cout_precision > 99 || cout_precision < 0) @@ -156,7 +158,8 @@ int main(int argc, char ** argv) t[5]=char('0'+cout_precision%10); //Matrix::set_print_format(t); print_format = t; - } else { // Load from file + } + else { // Load from file Matrix m; vcl_ifstream f(arg.c_str()); if (!m.read_ascii(f)) { --- vxl-1.14.0.orig/contrib/prip/vpyr/vpyr_2_tpyramid_level_elts.h +++ vxl-1.14.0/contrib/prip/vpyr/vpyr_2_tpyramid_level_elts.h @@ -179,7 +179,7 @@ class vpyr_2_tpyramid_level_element_iter vpyr_2_tpyramid_level_element_iterator(It arg,vmap_level_index l) :it_(arg) { - set(*arg,l) ; + this->set(*arg,l) ; } //: --- vxl-1.14.0.orig/contrib/prip/vpyr/vpyr_2_pyramid_level_elts.h +++ vxl-1.14.0/contrib/prip/vpyr/vpyr_2_pyramid_level_elts.h @@ -144,7 +144,7 @@ class vpyr_2_pyramid_level_dart_base_ite vpyr_2_pyramid_level_dart_base_iterator(const vpyr_2_pyramid_level_dart_base_iterator &it) :it_((It)it.reference()) { - set(*it_, it.level()) ; + this->set(*it_, it.level()) ; } //: @@ -152,7 +152,7 @@ class vpyr_2_pyramid_level_dart_base_ite self_type & operator=(const vpyr_2_pyramid_level_dart_base_iterator &it) { it_=(It)it.reference() ; - set(*it_, it.level()) ; + this->set(*it_, it.level()) ; return *this ; } @@ -267,7 +267,7 @@ class vpyr_2_pyramid_level_dart_base_ite vpyr_2_pyramid_level_dart_base_iterator(It arg,vmap_level_index l) :it_(arg) { - set(*arg,l) ; + this->set(*arg,l) ; } //: --- vxl-1.14.0.orig/contrib/prip/vmap/vmap_ptr_sequences.h +++ vxl-1.14.0/contrib/prip/vmap/vmap_ptr_sequences.h @@ -292,7 +292,7 @@ class vmap_owning_sequence: public vmap_ { clear() ; storage_.resize(arg_size) ; - set_begin(new pointer[arg_size]) ; + this->set_begin(new pointer[arg_size]) ; vmap_ptr_sequence::resize(arg_size) ; for (int i=0; iin_data(); ImgOut &out = this->out_data(); - int startx = start(this->X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (int j = starty; j < stopy; ++j) for (int i = startx; i < stopx; ++i) fsetpixel(out, i, j, func()(fgetpixel(in, i, j, DataIn(0)))); --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_dilate_disk.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_dilate_disk.txx @@ -12,10 +12,10 @@ bool vipl_dilate_disk X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (register int j = starty, ej = stopy; j < ej ; ++j) for (register int i = startx, ei = stopx; i < ei ; ++i) { --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_gradient_mag.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_gradient_mag.txx @@ -11,10 +11,10 @@ bool vipl_gradient_mag out_data_ptr(); register double dx, dy; - int startx = start(this->X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (int j = starty; j < stopy; ++j) for (int i = startx; i < stopx; ++i) { dx = fgetpixel(in, i, j, DataIn(0)) - getpixel(in, i-1, j, DataIn(0)); --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_x_gradient.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_x_gradient.txx @@ -9,10 +9,10 @@ bool vipl_x_gradient in_data(0); ImgOut &out = *this->out_data_ptr(); - int startx = start(this->X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (register int j = starty; j < stopy; ++j) for (register int i = startx+1; i < stopx; ++i) { DataIn w = fgetpixel(in, i, j, DataIn(0)) --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_gradient_dir.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_gradient_dir.txx @@ -10,10 +10,10 @@ bool vipl_gradient_dir in_data(0); ImgOut &out = *this->out_data_ptr(); - int startx = start(this->X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (int j = starty; j < stopy; ++j) for (int i = startx; i < stopx; ++i) { register double dx = fgetpixel(in, i, j, DataIn(0)) - getpixel(in, i-1, j, DataIn(0)); --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_moment.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_moment.txx @@ -46,10 +46,10 @@ bool vipl_moment X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); int sizex = stopx-startx+1; int sizey = stopy-starty+1; --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_sobel.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_sobel.txx @@ -9,10 +9,10 @@ bool vipl_sobel in_data(0); ImgOut &out = this->out_data(); // apply filter: - int startx = start(this->X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (int j = starty, ej = stopy; j < ej ; ++j) for (int i = startx, ei = stopx; i < ei ; ++i) fsetpixel(out, i, j, (DataOut)( --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_erode_disk.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_erode_disk.txx @@ -21,10 +21,10 @@ bool vipl_erode_disk X_Axis()); - int starty = 0; // = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); // = height(out); + int startx = vipl_filter::start(this->X_Axis()); + int starty = 0; // = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); // = height(out); #ifdef DEBUG vcl_cout << " (" << startx << ':' << stopx << ',' << starty << ':' << stopy << ')'; vcl_cout << " run over image ..."; --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_gaussian_convolution.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_gaussian_convolution.txx @@ -12,21 +12,23 @@ bool vipl_gaussian_convolution X_Axis()) - start(this->X_Axis()); - int height = stop(this->Y_Axis()) - start(this->Y_Axis()); + int width = vipl_filter::stop(this->X_Axis()) + - vipl_filter::start(this->X_Axis()); + int height = vipl_filter::stop(this->Y_Axis()) + - vipl_filter::start(this->Y_Axis()); double* buf = new double[width*height]; if (!buf) return false; // memory allocation failed // 1-D mask was generated in preop(), we just use it here: // horizontal convolution: - int starty = start(this->Y_Axis()); - int stopy = stop(this->Y_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (int j = starty; j < stopy; ++j) { int buf_j = j - starty; - int startx = start(this->X_Axis(),j); - int stopx = stop(this->X_Axis(),j); + int startx = vipl_filter::start(this->X_Axis(),j); + int stopx = vipl_filter::stop(this->X_Axis(),j); for (int i = startx; i < stopx; ++i) { int buf_i = i - startx; double result = mask()[0] * fgetpixel(in, i, j, DataIn(0)); @@ -39,8 +41,8 @@ bool vipl_gaussian_convolution X_Axis(),j); - int stopx = stop(this->X_Axis(),j); + int startx = vipl_filter::start(this->X_Axis(),j); + int stopx = vipl_filter::stop(this->X_Axis(),j); for (int i = startx; i < stopx; ++i) { int buf_i = i - startx; double result = mask()[0] * buf[buf_i+width*buf_j]; --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_convert.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_convert.txx @@ -14,10 +14,10 @@ bool vipl_convert in_data(0); ImgOut &out = this->out_data(0); - int startx = start(this->X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (int j = starty; j < stopy; ++j) for (int i = startx; i < stopx; ++i) fsetpixel(out, i, j, (DataOut)fgetpixel(in,i,j,DataIn(0))); --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_y_gradient.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_y_gradient.txx @@ -9,10 +9,10 @@ bool vipl_y_gradient in_data(0); ImgOut &out = *this->out_data_ptr(); - int startx = start(this->X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (register int j = starty+1; j < stopy; ++j) for (register int i = startx; i < stopx; ++i) { DataIn w = fgetpixel(in, i, j, DataIn(0)) --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_add_random_noise.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_add_random_noise.txx @@ -7,10 +7,10 @@ template bool vipl_add_random_noise :: section_applyop() { - int startx = start(this->X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (register int j = starty; j < stopy; ++j) for (register int i = startx; i < stopx; ++i) { --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_threshold.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_threshold.txx @@ -9,10 +9,10 @@ bool vipl_threshold in_data(); ImgOut &out = this->out_data(); - int startx = start(this->X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (int j = starty; j < stopy; ++j) for (int i = startx; i < stopx; ++i) { DataIn p = fgetpixel(in, i, j, DataIn(0)); --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_median.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_median.txx @@ -14,10 +14,10 @@ bool vipl_median X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (int j = starty; j < stopy; ++j) for (int i = startx; i < stopx; ++i) { register int count = 0; --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_dyadic.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_dyadic.txx @@ -9,10 +9,10 @@ bool vipl_dyadic in_data(); ImgOut &out = this->out_data(); - int startx = start(this->X_Axis()); - int starty = start(this->Y_Axis()); - int stopx = stop(this->X_Axis()); - int stopy = stop(this->Y_Axis()); + int startx = vipl_filter::start(this->X_Axis()); + int starty = vipl_filter::start(this->Y_Axis()); + int stopx = vipl_filter::stop(this->X_Axis()); + int stopy = vipl_filter::stop(this->Y_Axis()); for (int j = starty; j < stopy; ++j) for (int i = startx; i < stopx; ++i) { DataIn p = fgetpixel(in, i, j, DataIn(0)); --- vxl-1.14.0.orig/contrib/tbl/vipl/vipl_histogram.txx +++ vxl-1.14.0/contrib/tbl/vipl/vipl_histogram.txx @@ -14,8 +14,10 @@ bool vipl_histogram Y_Axis()), ej = stop(this->Y_Axis()) ; j < ej ; ++j) - for (int i = start(this->X_Axis(),j), ei = stop(this->X_Axis(),j) ; i < ei ; ++i) { + for (int j = vipl_filter::start(this->Y_Axis()), + ej = vipl_filter::stop(this->Y_Axis()) ; j < ej ; ++j) + for (int i = vipl_filter::start(this->X_Axis(),j), + ei = vipl_filter::stop(this->X_Axis(),j) ; i < ei ; ++i) { long bin = long(0.5 + (shiftin()+getpixel(in,i,j,DataIn(0)))/scalein()); #if 0 if (bin < 0) bin = 0; @@ -26,22 +28,30 @@ bool vipl_histogram Y_Axis()), ej = stop(this->Y_Axis()) ; j < ej ; ++j) - for (int i = start(this->X_Axis(),j), ei = stop(this->X_Axis(),j) ; i < ei ; ++i) { + for (int j = vipl_filter::start(this->Y_Axis()), + ej = vipl_filter::stop(this->Y_Axis()) ; j < ej ; ++j) + for (int i = vipl_filter::start(this->X_Axis(),j), + ei = vipl_filter::stop(this->X_Axis(),j) ; i < ei ; ++i) { long bin = long(0.5 + (getpixel(in,i,j,DataIn(0)))); DataOut bs = getpixel(out,bin,index,DataOut(0)); setpixel(out, bin, index, bs+1); } - } else if (scalein() == 1) { - for (int j = start(this->Y_Axis()), ej = stop(this->Y_Axis()) ; j < ej ; ++j) - for (int i = start(this->X_Axis(),j), ei = stop(this->X_Axis(),j) ; i < ei ; ++i) { + } + else if (scalein() == 1) { + for (int j = vipl_filter::start(this->Y_Axis()), + ej = vipl_filter::stop(this->Y_Axis()) ; j < ej ; ++j) + for (int i = vipl_filter::start(this->X_Axis(),j), + ei = vipl_filter::stop(this->X_Axis(),j) ; i < ei ; ++i) { long bin = long(0.5 + (shiftin()+getpixel(in,i,j,DataIn(0)))); DataOut bs = getpixel(out,bin,index,DataOut(0)); setpixel(out, bin, index, scaleout()+bs); } - } else { // all modes - for (int j = start(this->Y_Axis()), ej = stop(this->Y_Axis()) ; j < ej ; ++j) - for (int i = start(this->X_Axis(),j), ei = stop(this->X_Axis(),j) ; i < ei ; ++i) { + } + else { // all modes + for (int j = vipl_filter::start(this->Y_Axis()), + ej = vipl_filter::stop(this->Y_Axis()) ; j < ej ; ++j) + for (int i = vipl_filter::start(this->X_Axis(),j), + ei = vipl_filter::stop(this->X_Axis(),j) ; i < ei ; ++i) { long bin = long(0.5 + (shiftin()+getpixel(in,i,j,DataIn(0)))/scalein()); DataOut bs = getpixel(out,bin,index,DataOut(0)); setpixel(out, bin, index, scaleout()+bs); @@ -55,8 +65,8 @@ bool vipl_histogram out_data_ptr(); - for (int i = start_dst(this->X_Axis()), - ei = stop_dst(this->X_Axis()); i < ei; ++i) + for (int i = this->start_dst(this->X_Axis()), + ei = this->stop_dst(this->X_Axis()); i < ei; ++i) setpixel(out, i, index, DataOut(0)); return true; } --- vxl-1.14.0.orig/contrib/tbl/vipl/filter/vipl_filter_2d.txx +++ vxl-1.14.0/contrib/tbl/vipl/filter/vipl_filter_2d.txx @@ -112,7 +112,7 @@ template < class ImgIn,class ImgOut,clas vipl_section_descriptor& secDesc = *dstitr; put_secp( new vipl_section_descriptor (secDesc) ); #else - put_secp( new vipl_section_descriptor (*dstitr)); + vipl_filter::put_secp( new vipl_section_descriptor (*dstitr)); #endif this->ref_dst_section()->ref_overlap()[0] = this->image_border_size(); this->ref_dst_section()->ref_overlap()[1] = this->image_border_size(); @@ -121,7 +121,7 @@ template < class ImgIn,class ImgOut,clas vipl_section_descriptor& inSecDesc = *it; put_insecp( new vipl_section_descriptor (inSecDesc)); #else - put_insecp( new vipl_section_descriptor (*it)); + vipl_filter::put_insecp( new vipl_section_descriptor (*it)); #endif this->ref_src_section()->ref_overlap()[0] = this->image_border_size(); this->ref_src_section()->ref_overlap()[1] = this->image_border_size(); @@ -151,7 +151,7 @@ template < class ImgIn,class ImgOut,clas vipl_section_descriptor& secDesc2 = *it; put_secp( new vipl_section_descriptor (secDesc2)); #else - put_secp( new vipl_section_descriptor (*it)); + vipl_filter::put_secp( new vipl_section_descriptor (*it)); #endif this->ref_dst_section()->ref_overlap()[0] = this->image_border_size(); this->ref_dst_section()->ref_overlap()[1] = this->image_border_size(); @@ -160,7 +160,7 @@ template < class ImgIn,class ImgOut,clas vipl_section_descriptor& inSecDesc2 = *srcitr; put_insecp( new vipl_section_descriptor (inSecDesc2)); #else - put_insecp( new vipl_section_descriptor (*srcitr)); + vipl_filter::put_insecp( new vipl_section_descriptor (*srcitr)); #endif this->ref_src_section()->ref_overlap()[0] = this->image_border_size(); this->ref_src_section()->ref_overlap()[1] = this->image_border_size(); --- vxl-1.14.0.orig/contrib/rpl/rgrl/rgrl_est_proj_rad_func.txx +++ vxl-1.14.0/contrib/rpl/rgrl/rgrl_est_proj_rad_func.txx @@ -139,7 +139,7 @@ reduced_proj_rad_jacobian( vnl_matrix dP_dp; - reduced_proj_jacobian( dP_dp, proj, from ); + base_type::reduced_proj_jacobian( dP_dp, proj, from ); // 2. gradient w.r.t to mapped location vnl_matrix_fixed dD_dx; @@ -220,7 +220,7 @@ full_proj_rad_jacobian( vnl_matrix dP_dp; - full_proj_jacobian( dP_dp, proj, from ); + base_type::full_proj_jacobian( dP_dp, proj, from ); // 2. gradient w.r.t to mapped location vnl_matrix_fixed dD_dx; @@ -358,7 +358,7 @@ f(vnl_vector const& x, vnl_vecto // retrieve the projection matrix vnl_matrix_fixed proj; - restored_centered_proj( proj, x ); + base_type::restored_centered_proj( proj, x ); // retrieve the radial distortion parameters transfer_radial_params_into_temp_storage( x ); @@ -407,7 +407,7 @@ gradf(vnl_vector const& x, vnl_m // retrieve the projection matrix vnl_matrix_fixed proj; - restored_centered_proj( proj, x ); + base_type::restored_centered_proj( proj, x ); // retrieve the radial distortion parameters transfer_radial_params_into_temp_storage( x ); --- vxl-1.14.0.orig/contrib/rpl/rgrl/rgrl_est_proj_rad_func.h +++ vxl-1.14.0/contrib/rpl/rgrl/rgrl_est_proj_rad_func.h @@ -18,6 +18,8 @@ class rgrl_est_proj_rad_func : public rgrl_est_proj_func { public: + typedef rgrl_est_proj_func base_type; + public: //: ctor rgrl_est_proj_rad_func( rgrl_set_of const& matches, unsigned int camera_dof, --- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/vpgl_essential_matrix.txx +++ vxl-1.14.0/contrib/gel/mrc/vpgl/vpgl_essential_matrix.txx @@ -66,7 +66,7 @@ template const vpgl_essential_matrix& vpgl_essential_matrix::operator=( const vpgl_essential_matrix& fm ) { - set_matrix( fm.F_ ); + vpgl_fundamental_matrix::set_matrix( fm.F_ ); return *this; } --- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/vpgl_reg_fundamental_matrix.txx +++ vxl-1.14.0/contrib/gel/mrc/vpgl/vpgl_reg_fundamental_matrix.txx @@ -16,7 +16,7 @@ vpgl_reg_fundamental_matrix::vpgl_reg vnl_matrix_fixed default_matrix( (T)0 ); default_matrix(0,1) = default_matrix(0,2) = (T)1; default_matrix(1,0) = default_matrix(2,0) = -(T)1; - set_matrix( default_matrix ); + vpgl_fundamental_matrix::set_matrix( default_matrix ); } @@ -53,7 +53,7 @@ bool vpgl_reg_fundamental_matrix::set fm.put( 1, 2, -ex ); fm.put( 2, 0, -ey ); fm.put( 2, 1, ex ); - set_matrix( fm ); + vpgl_fundamental_matrix::set_matrix( fm ); return true; } @@ -67,7 +67,7 @@ void vpgl_reg_fundamental_matrix::set fm.put( 1, 2, -b ); fm.put( 2, 0, -a ); fm.put( 2, 1, b ); - set_matrix( fm ); + vpgl_fundamental_matrix::set_matrix( fm ); }; --- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/vpgl_affine_fundamental_matrix.txx +++ vxl-1.14.0/contrib/gel/mrc/vpgl/vpgl_affine_fundamental_matrix.txx @@ -16,7 +16,7 @@ vpgl_affine_fundamental_matrix::vpgl_ vnl_matrix_fixed default_matrix( (T)0 ); default_matrix(0,1) = default_matrix(0,2) = (T)1; default_matrix(1,0) = default_matrix(2,0) = -(T)1; - set_matrix( default_matrix ); + vpgl_fundamental_matrix::set_matrix( default_matrix ); } @@ -40,7 +40,7 @@ void vpgl_affine_fundamental_matrix:: fm.put( 2, 2, c ); fm.put( 1, 2, d ); fm.put( 0, 2, e ); - set_matrix( fm ); + vpgl_fundamental_matrix::set_matrix( fm ); }; --- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/vpgl_affine_camera.txx +++ vxl-1.14.0/contrib/gel/mrc/vpgl/vpgl_affine_camera.txx @@ -14,7 +14,7 @@ vpgl_affine_camera::vpgl_affine_camer { vnl_matrix_fixed C( (T)0 ); C(0,0) = C(1,1) = C(2,3) = (T)1; - set_matrix( C ); + vpgl_proj_camera::set_matrix( C ); } @@ -35,7 +35,7 @@ vpgl_affine_camera::vpgl_affine_camer vnl_matrix_fixed C( camera_matrix ); C = C/C(2,3); C(2,0) = (T)0; C(2,1) = (T)0; C(2,2) = (T)0; - set_matrix( C ); + vpgl_proj_camera::set_matrix( C ); } @@ -51,7 +51,7 @@ void vpgl_affine_camera::set_rows( C(1,i) = row2(i); } C(2,3) = (T)1; - set_matrix( C ); + vpgl_proj_camera::set_matrix( C ); } // Code for easy instantiation. --- vxl-1.14.0.orig/contrib/gel/mrc/vpgl/vpgl_local_rational_camera.txx +++ vxl-1.14.0/contrib/gel/mrc/vpgl/vpgl_local_rational_camera.txx @@ -126,16 +126,16 @@ bool vpgl_local_rational_camera::save << "SpecId = \"RPC00B\";\n" << "BEGIN_GROUP = IMAGE\n" << "\n\n" // skip errBias and errRand fields - << " lineOffset = " << offset(vpgl_rational_camera::V_INDX) << '\n' - << " sampOffset = " << offset(vpgl_rational_camera::U_INDX) << '\n' - << " latOffset = " << offset(vpgl_rational_camera::Y_INDX) << '\n' - << " longOffset = " << offset(vpgl_rational_camera::X_INDX) << '\n' - << " heightOffset = " << offset(vpgl_rational_camera::Z_INDX) << '\n' - << " lineScale = " << scale(vpgl_rational_camera::V_INDX) << '\n' - << " sampScale = " << scale(vpgl_rational_camera::U_INDX) << '\n' - << " latScale = " << scale(vpgl_rational_camera::Y_INDX) << '\n' - << " longScale = " << scale(vpgl_rational_camera::X_INDX) << '\n' - << " heightScale = " << scale(vpgl_rational_camera::Z_INDX) << '\n'; + << " lineOffset = " << vpgl_rational_camera::offset(vpgl_rational_camera::V_INDX) << '\n' + << " sampOffset = " << vpgl_rational_camera::offset(vpgl_rational_camera::U_INDX) << '\n' + << " latOffset = " << vpgl_rational_camera::offset(vpgl_rational_camera::Y_INDX) << '\n' + << " longOffset = " << vpgl_rational_camera::offset(vpgl_rational_camera::X_INDX) << '\n' + << " heightOffset = " << vpgl_rational_camera::offset(vpgl_rational_camera::Z_INDX) << '\n' + << " lineScale = " << vpgl_rational_camera::scale(vpgl_rational_camera::V_INDX) << '\n' + << " sampScale = " << vpgl_rational_camera::scale(vpgl_rational_camera::U_INDX) << '\n' + << " latScale = " << vpgl_rational_camera::scale(vpgl_rational_camera::Y_INDX) << '\n' + << " longScale = " << vpgl_rational_camera::scale(vpgl_rational_camera::X_INDX) << '\n' + << " heightScale = " << vpgl_rational_camera::scale(vpgl_rational_camera::Z_INDX) << '\n'; vnl_matrix_fixed coeffs = this->coefficient_matrix(); file_out << " lineNumCoef = ("; for (int i=0; i<20; i++) { --- vxl-1.14.0.orig/contrib/brl/bbas/bsta/algo/bsta_adaptive_updater.txx +++ vxl-1.14.0/contrib/brl/bbas/bsta/algo/bsta_adaptive_updater.txx @@ -42,7 +42,7 @@ bsta_mg_statistical_updater:: // if no matches add a new component if (matched.empty()) { - insert(mix,sample,alpha); + this->insert(mix,sample,alpha); mix.normalize_weights(); } else @@ -123,7 +123,7 @@ bsta_mg_grimson_statistical_updaterinsert(mix,sample,alpha); match = mix.num_components()-1; } --- vxl-1.14.0.orig/contrib/brl/bbas/bsta/algo/bsta_sample_set.h +++ vxl-1.14.0/contrib/brl/bbas/bsta/algo/bsta_sample_set.h @@ -35,7 +35,7 @@ class bsta_sample_set : public bsta_parz typedef typename bsta_parzen_sphere::vector_type vector_; // Constructor - bsta_sample_set(T bandwidth = T(1)) : bsta_parzen_sphere() { set_bandwidth(bandwidth); } + bsta_sample_set(T bandwidth = T(1)) : bsta_parzen_sphere() { this->set_bandwidth(bandwidth); } //: Compute the mean in a window around the given pt, the window size is the bandwidth // If there are no points within bandwidth of the input pt, \return false debian/patches/removedoxyen.patch0000644000000000000000000000141411751234123014361 0ustar Description: missing doxy_header.html file Author: Dominique Belhachemi Last-Update: 2012-01-23 Forwarded: no Bug: http://bugs.debian.org/656922 Index: vxl-1.14.0/config/cmake/Modules/UseVXL.cmake =================================================================== --- vxl-1.14.0.orig/config/cmake/Modules/UseVXL.cmake 2012-01-23 11:05:18.000000000 +0100 +++ vxl-1.14.0/config/cmake/Modules/UseVXL.cmake 2012-01-23 11:05:27.000000000 +0100 @@ -132,7 +132,7 @@ ENDIF(VXL_PROVIDE_OLD_CACHE_NAMES) # Allow use of VXL's cmake/doxygen framework - INCLUDE(${VXL_CMAKE_DOXYGEN_DIR}/doxygen.cmake) + #INCLUDE(${VXL_CMAKE_DOXYGEN_DIR}/doxygen.cmake) IF(VXL_PROVIDE_STANDARD_OPTIONS) # Provide the standard set of VXL CMake options to the project. debian/patches/renamelibs.patch0000644000000000000000000001031012162564431013756 0ustar Description: debian specific patch to prevent library name clash. Why is everybody using 3 letters for a library name ? Author: Mathieu Malaterre Last-Update: 2011-07-24 Forwarded: not-needed Bug-Debian: http://bugs.debian.org/708666 Index: vxl-1.17.0/contrib/oxl/xcv/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/oxl/xcv/CMakeLists.txt 2013-05-19 12:51:30.494534817 +0000 +++ vxl-1.17.0/contrib/oxl/xcv/CMakeLists.txt 2013-05-19 12:51:41.350534782 +0000 @@ -32,6 +32,6 @@ ADD_EXECUTABLE(xcv ${xcv_sources}) INSTALL_TARGETS(/bin xcv) -TARGET_LINK_LIBRARIES(xcv osl mvl vgui vgl vil1 vnl vul vcl) +TARGET_LINK_LIBRARIES(xcv oxl_osl mvl vgui vgl vil1 vnl vul vcl) ENDIF (HAS_VGUI) Index: vxl-1.17.0/contrib/conversions/geometry/tests/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/conversions/geometry/tests/CMakeLists.txt 2013-05-19 12:51:30.506534820 +0000 +++ vxl-1.17.0/contrib/conversions/geometry/tests/CMakeLists.txt 2013-05-19 12:51:41.350534782 +0000 @@ -6,7 +6,7 @@ ENDIF(BUILD_GEL) IF(BUILD_OXL) INCLUDE_DIRECTORIES(${OXL_INCLUDE_DIR}) - LINK_LIBRARIES( osl ) + LINK_LIBRARIES( oxl_osl ) ENDIF(BUILD_OXL) IF(BUILD_GEL) Index: vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/b3p/minizip/CMakeLists.txt 2013-05-19 12:52:37.858534588 +0000 +++ vxl-1.17.0/contrib/brl/b3p/minizip/CMakeLists.txt 2013-05-19 12:53:08.818534483 +0000 @@ -21,10 +21,10 @@ iowin32.c iowin32.h) ENDIF(WIN32) -ADD_LIBRARY( minizip ${minizip_sources} ) -TARGET_LINK_LIBRARIES( minizip z) -SET_TARGET_PROPERTIES(minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES}) -INSTALL_TARGETS( /lib minizip ) +ADD_LIBRARY( b3p_minizip ${minizip_sources} ) +TARGET_LINK_LIBRARIES( b3p_minizip z) +SET_TARGET_PROPERTIES(b3p_minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS( /lib b3p_minizip ) INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/minizip ${minizip_sources}) ENDIF(ZLIB_FOUND) Index: vxl-1.17.0/contrib/gel/gst/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/gel/gst/CMakeLists.txt 2013-05-19 12:53:12.938534466 +0000 +++ vxl-1.17.0/contrib/gel/gst/CMakeLists.txt 2013-05-19 12:57:34.698533568 +0000 @@ -16,12 +16,12 @@ AUX_SOURCE_DIRECTORY(Templates gst_sources) -ADD_LIBRARY(gst ${gst_sources}) -SET_TARGET_PROPERTIES(gst PROPERTIES ${VNL_LIBRARY_PROPERTIES}) -INSTALL_TARGETS(/lib gst) +ADD_LIBRARY(gel_gst ${gst_sources}) +SET_TARGET_PROPERTIES(gel_gst PROPERTIES ${VNL_LIBRARY_PROPERTIES}) +INSTALL_TARGETS(/lib gel_gst) INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/gel/gst ${gst_sources}) -TARGET_LINK_LIBRARIES(gst vbl) +TARGET_LINK_LIBRARIES(gel_gst vbl) IF( BUILD_TESTING ) SUBDIRS(tests) Index: vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2013-05-19 12:51:41.250534781 +0000 +++ vxl-1.17.0/contrib/brl/bseg/bmdl/pro/CMakeLists.txt 2013-05-19 13:34:38.678525936 +0000 @@ -36,10 +36,10 @@ INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmdl/pro ${bmdl_pro_sources}) 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) + vsol brip vpgl_pro vgl vul vpl imesh_algo b3p_minizip) IF(ZLIB_FOUND) - TARGET_LINK_LIBRARIES( bmdl_pro minizip ) + TARGET_LINK_LIBRARIES( bmdl_pro b3p_minizip ) ENDIF(ZLIB_FOUND) IF( BUILD_TESTING ) Index: vxl-1.17.0/contrib/gel/gst/tests/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/gel/gst/tests/CMakeLists.txt 2010-09-26 06:37:58.000000000 +0000 +++ vxl-1.17.0/contrib/gel/gst/tests/CMakeLists.txt 2013-05-19 13:31:09.158526657 +0000 @@ -1,2 +1,2 @@ ADD_EXECUTABLE(gst_test_include test_include.cxx ) -TARGET_LINK_LIBRARIES( gst_test_include gst ) +TARGET_LINK_LIBRARIES( gst_test_include gel_gst ) debian/patches/fixcomp.patch0000644000000000000000000000264611751234123013312 0ustar Description: avoid compiler warning or error (not all paths return a value) Author: Mathieu Malaterre Last-Update: 2011-07-24 Bug: https://sourceforge.net/apps/trac/vxl/ticket/70 Applied-Upstream: http://vxl.svn.sf.net/viewvc/vxl?view=revision&revision=28125 Index: vxl-1.14.0/contrib/brl/bseg/bvxm/pro/processes/bvxm_update_edges_process.cxx =================================================================== --- vxl-1.14.0.orig/contrib/brl/bseg/bvxm/pro/processes/bvxm_update_edges_process.cxx 2011-04-26 16:09:55.000000000 +0200 +++ vxl-1.14.0/contrib/brl/bseg/bvxm/pro/processes/bvxm_update_edges_process.cxx 2011-04-26 16:10:14.000000000 +0200 @@ -48,6 +48,7 @@ return false; // this process process has no outputs + return true; } //: optimizes rpc camera parameters based on edges Index: vxl-1.14.0/contrib/brl/bseg/boxm/opt/open_cl/boxm_ray_trace_manager.txx =================================================================== --- vxl-1.14.0.orig/contrib/brl/bseg/boxm/opt/open_cl/boxm_ray_trace_manager.txx 2011-04-26 16:10:20.000000000 +0200 +++ vxl-1.14.0/contrib/brl/bseg/boxm/opt/open_cl/boxm_ray_trace_manager.txx 2011-04-26 16:10:29.000000000 +0200 @@ -15,6 +15,8 @@ #include #include +#include // memalign + //allocate child cells on the array template static void split(vcl_vector >& cell_array, debian/patches/fixcompilation2.patch0000644000000000000000000000501712144721037014751 0ustar Description: Various compilation fixes Author: Mathieu Malaterre Forwarded: yes Index: vxl-1.17.0/contrib/brl/b3p/shapelib/tests/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/b3p/shapelib/tests/CMakeLists.txt 2010-09-26 08:37:58.000000000 +0200 +++ vxl-1.17.0/contrib/brl/b3p/shapelib/tests/CMakeLists.txt 2012-07-28 20:58:45.335213478 +0200 @@ -1,2 +1,2 @@ ADD_EXECUTABLE(shapelib_test_include test_include.cxx ) -TARGET_LINK_LIBRARIES( shapelib_test_include shapelib ) +TARGET_LINK_LIBRARIES( shapelib_test_include shp ) Index: vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/baio/baio_unix.cxx 2010-11-22 17:11:21.000000000 +0100 +++ vxl-1.17.0/contrib/brl/bbas/baio/baio_unix.cxx 2012-07-28 20:58:45.339213477 +0200 @@ -11,7 +11,7 @@ #include //for aio_read //#include // for open (not really necessary #include //includes bzero - +#include //: baio_info struct: wrapper for status variables struct baio_info { Index: vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-05-31 21:59:20.000000000 +0200 +++ vxl-1.17.0/contrib/brl/bbas/bwm/algo/CMakeLists.txt 2012-07-28 20:58:45.339213477 +0200 @@ -32,7 +32,7 @@ ADD_LIBRARY(bwm_algo ${bwm_algo_sources}) -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 ) +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 shp ) IF( BUILD_TESTING ) SUBDIRS(tests) Index: vxl-1.17.0/vcl/vcl_config_compiler.h.in =================================================================== --- vxl-1.17.0.orig/vcl/vcl_config_compiler.h.in 2012-03-16 16:26:54.000000000 +0100 +++ vxl-1.17.0/vcl/vcl_config_compiler.h.in 2012-07-28 20:58:45.339213477 +0200 @@ -145,7 +145,7 @@ // define VCL_CAN_STATIC_CONST_INIT_FLOAT to either 0 or 1. //#define VCL_CAN_STATIC_CONST_INIT_FLOAT 1 /* allowed */ -//#define VCL_CAN_STATIC_CONST_INIT_FLOAT 0 /* not allowed */ +#define VCL_CAN_STATIC_CONST_INIT_FLOAT 0 /* not allowed */ #ifndef VCL_CAN_STATIC_CONST_INIT_FLOAT # define VCL_CAN_STATIC_CONST_INIT_FLOAT @VCL_STATIC_CONST_INIT_FLOAT@ #endif debian/patches/compflags.patch0000644000000000000000000006350312245636771013635 0ustar Description: do not set optimization flags explicitely Author: Mathieu Malaterre Forwarded: no Index: vxl-1.17.0/core/vnl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vnl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vnl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -241,19 +241,6 @@ AUX_SOURCE_DIRECTORY(Templates vnl_sources) IF(CMAKE_COMPILER_IS_GNUCXX) - # with optimisation, the is_finite etc functions fail on Alpha for long double: - SET_SOURCE_FILES_PROPERTIES(vnl_math.cxx PROPERTIES COMPILE_FLAGS -O0) - SET_SOURCE_FILES_PROPERTIES(vnl_bignum.cxx PROPERTIES COMPILE_FLAGS -O0) - # and these need too much memory with gcc 3.0 on Alpha: - SET_SOURCE_FILES_PROPERTIES(Templates/vnl_matrix+long-.cxx PROPERTIES COMPILE_FLAGS -O0) - SET_SOURCE_FILES_PROPERTIES(Templates/vnl_matrix+ulong-.cxx PROPERTIES COMPILE_FLAGS -O0) - SET_SOURCE_FILES_PROPERTIES(Templates/vnl_matrix+vcl_complex+double--.cxx PROPERTIES COMPILE_FLAGS -O0) - SET_SOURCE_FILES_PROPERTIES(Templates/vnl_matrix+vcl_complex+long_double--.cxx PROPERTIES COMPILE_FLAGS -O0) - SET_SOURCE_FILES_PROPERTIES(Templates/vnl_matrix_fixed+vnl_bignum.3.3-.cxx PROPERTIES COMPILE_FLAGS -O0) - SET_SOURCE_FILES_PROPERTIES(Templates/vnl_vector+vnl_rational-.cxx PROPERTIES COMPILE_FLAGS -O0) - SET_SOURCE_FILES_PROPERTIES(Templates/vnl_vector_fixed+vnl_rational.3-.cxx PROPERTIES COMPILE_FLAGS -O0) - # with optimisation, the vnl_na etc functions fail on x86_64: - SET_SOURCE_FILES_PROPERTIES(vnl_na.cxx PROPERTIES COMPILE_FLAGS -O1) # gcc must have -msse2 option to enable sse2 support IF(VNL_CONFIG_ENABLE_SSE2) ADD_DEFINITIONS( -msse2 ) Index: vxl-1.17.0/core/vnl/io/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vnl/io/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vnl/io/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -19,12 +19,6 @@ AUX_SOURCE_DIRECTORY(Templates vnl_io_sources) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(Templates/vsl_vector_io+vcl_vector+vcl_vector+vnl_vector+double----.cxx - PROPERTIES - COMPILE_FLAGS -ftemplate-depth-35) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY(vnl_io ${vnl_io_sources} ) SET_TARGET_PROPERTIES(vnl_io PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vnl_io vnl vsl ) Index: vxl-1.17.0/core/vnl/tests/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vnl/tests/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vnl/tests/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -49,12 +49,6 @@ test_vnl_index_sort.cxx ) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(test_rational.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(test_bignum.cxx PROPERTIES COMPILE_FLAGS -O3) - SET_SOURCE_FILES_PROPERTIES(test_finite.cxx PROPERTIES COMPILE_FLAGS -O0) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - TARGET_LINK_LIBRARIES(vnl_test_all vnl vpl vul testlib ${CMAKE_THREAD_LIBS}) ADD_EXECUTABLE(vnl_basic_operation_timings basic_operation_timings.cxx) Index: vxl-1.17.0/core/vidl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vidl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vidl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -152,9 +152,6 @@ INCLUDE(CheckCXXCompilerFlag) SET( TEMPLATE_DEPTH_FLAG -ftemplate-depth-1000 ) CHECK_CXX_COMPILER_FLAG(${TEMPLATE_DEPTH_FLAG} HAS_TEMPLATE_DEPTH_FLAG) -IF( HAS_TEMPLATE_DEPTH_FLAG ) - SET_TARGET_PROPERTIES( vidl PROPERTIES COMPILE_FLAGS ${TEMPLATE_DEPTH_FLAG}) -ENDIF( HAS_TEMPLATE_DEPTH_FLAG ) # vgui add on library SUBDIRS( gui ) Index: vxl-1.17.0/core/vpl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vpl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vpl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -14,9 +14,6 @@ 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) TARGET_LINK_LIBRARIES( vpl vcl ) Index: vxl-1.17.0/core/vgui/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vgui/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vgui/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -335,10 +335,6 @@ SET( vgui_sources ${vgui_sources} ${vgui_qt_sources} ${vgui_qt_moc_files} ) - IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/moc_vgui_qt_adaptor.cxx GENERATED PROPERTIES COMPILE_FLAGS -O0) - ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ENDIF(VGUI_USE_QT) ENDIF (QT_FOUND) Index: vxl-1.17.0/core/vsl/tests/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vsl/tests/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vsl/tests/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -21,10 +21,6 @@ test_block_rle_io.cxx ) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(test_map_io.cxx PROPERTIES COMPILE_FLAGS -O0) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_TEST(vsl_test_indent ${EXECUTABLE_OUTPUT_PATH}/vsl_test_all test_indent) ADD_TEST(vsl_test_binary_io ${EXECUTABLE_OUTPUT_PATH}/vsl_test_all test_binary_io) Index: vxl-1.17.0/core/vcsl/examples/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vcsl/examples/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vcsl/examples/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -4,7 +4,3 @@ ADD_EXECUTABLE(vcsl_example1 example1.cxx) ADD_EXECUTABLE(vcsl_tutor vcsl_tutor.cxx) - -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(example1.cxx PROPERTIES COMPILE_FLAGS -O1) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) Index: vxl-1.17.0/core/vgl/xio/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vgl/xio/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vgl/xio/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -11,9 +11,6 @@ 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) TARGET_LINK_LIBRARIES( vgl_xio vgl vsl ) INSTALL_TARGETS(/lib vgl_xio) Index: vxl-1.17.0/core/vil/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vil/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vil/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -281,11 +281,6 @@ AUX_SOURCE_DIRECTORY(Templates vil_sources) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(vil_na.cxx PROPERTIES COMPILE_FLAGS -O1) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - - # Some versions of Solaris (at least 5.8) has a brain-dead mechanism # for implementing DNS services, where the user of a library that uses # gethostbyname should link to -lnsl *before* linking to the Index: vxl-1.17.0/core/vil/io/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vil/io/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vil/io/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -8,12 +8,6 @@ ) AUX_SOURCE_DIRECTORY(Templates vil_io_sources) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(Templates/vsl_vector_io+vcl_vector+vil_image_view+float---.cxx - PROPERTIES - COMPILE_FLAGS -ftemplate-depth-35) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY(vil_io ${vil_io_sources}) SET_TARGET_PROPERTIES(vil_io PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( vil_io vil vsl ) Index: vxl-1.17.0/core/vil/algo/tests/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vil/algo/tests/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vil/algo/tests/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -40,10 +40,6 @@ test_algo_flood_fill.cxx ) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(test_algo_convolve_1d.cxx PROPERTIES COMPILE_FLAGS -O0) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - TARGET_LINK_LIBRARIES( vil_algo_test_all vil_algo testlib vcl ) Index: vxl-1.17.0/core/vil1/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vil1/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vil1/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -164,10 +164,6 @@ AUX_SOURCE_DIRECTORY(Templates vil1_sources) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(vil1_image_as.cxx PROPERTIES COMPILE_FLAGS -O0) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY(vil1 ${vil1_sources}) SET_TARGET_PROPERTIES(vil1 PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib vil1) Index: vxl-1.17.0/core/vul/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/core/vul/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/core/vul/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -48,10 +48,6 @@ ) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(vul_sequence_filename_map.cxx PROPERTIES COMPILE_FLAGS -O0) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - IF(APPLE) ADD_LIBRARY(vul ${vul_sources}) INSTALL_TARGETS(/lib vul) Index: vxl-1.17.0/v3p/zlib/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/v3p/zlib/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/v3p/zlib/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -28,10 +28,6 @@ ) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(deflate.c PROPERTIES COMPILE_FLAGS -O1) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY( z ${zlib_sources} ) INSTALL_TARGETS( /lib z ) Index: vxl-1.17.0/v3p/Qv/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/v3p/Qv/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/v3p/Qv/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -164,10 +164,6 @@ AUX_SOURCE_DIRECTORY( Templates Qv_sources ) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(QvLib.cxx PROPERTIES COMPILE_FLAGS -O1) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY( Qv ${Qv_sources} ) SET_TARGET_PROPERTIES(Qv PROPERTIES ${VNL_LIBRARY_PROPERTIES}) Index: vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/rpl/rsdl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/rpl/rsdl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -16,10 +16,6 @@ AUX_SOURCE_DIRECTORY(Templates rsdl_sources) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(Templates/rsdl_bins_2d+double.int-.cxx PROPERTIES COMPILE_FLAGS -O1) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY(rsdl ${rsdl_sources}) SET_TARGET_PROPERTIES(rsdl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib rsdl) Index: vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/mul/mbl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/mul/mbl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -116,10 +116,6 @@ AUX_SOURCE_DIRECTORY(Templates mbl_sources) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(Templates/mbl_data_wrapper_mixer+vnl_vector+double--.cxx PROPERTIES COMPILE_FLAGS -O0) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY(mbl ${mbl_sources}) SET_TARGET_PROPERTIES(mbl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(mbl vnl_io vnl_algo vgl_io vgl vbl_io vil_io vsl vnl vil vul vbl) Index: vxl-1.17.0/contrib/mul/mil/tests/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/mul/mil/tests/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/mul/mil/tests/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -5,10 +5,6 @@ ADD_EXECUTABLE(mil_test_all test_mil.cxx) ADD_TEST(mil_test_all ${EXECUTABLE_OUTPUT_PATH}/mil_test_all) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(test_mil.cxx PROPERTIES COMPILE_FLAGS -O0) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_EXECUTABLE(mil_test_include test_include.cxx) TARGET_LINK_LIBRARIES(mil_test_include mil_algo) ADD_EXECUTABLE(mil_test_template_include test_template_include.cxx) Index: vxl-1.17.0/contrib/brl/bseg/brec_batch/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/brec_batch/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/brl/bseg/brec_batch/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -24,9 +24,6 @@ SET_TARGET_PROPERTIES(brec_batch PROPERTIES OUTPUT_NAME brec_batch DEBUG_POSTFIX _d SUFFIX .pyd) ENDIF(WIN32) SET_TARGET_PROPERTIES(brec_batch PROPERTIES PREFIX "") - IF(NOT WIN32) - SET_TARGET_PROPERTIES(bbgm_batch PROPERTIES COMPILE_FLAGS "-fPIC") - ENDIF(NOT WIN32) TARGET_LINK_LIBRARIES(brec_batch bprb brdb bpro_batch bmdl_pro bvxm_pro bvxm_io bvxm_grid_io brec_pro bbgm_pro bvgl_pro brip_pro bsvg_pro vbl vpgl_io vidl_pro vpgl_pro vil_io vil_pro) Index: vxl-1.17.0/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -64,7 +64,6 @@ IF( CMAKE_USE_PTHREADS_INIT ) ADD_DEFINITIONS(-DBVPL_OCTREE_HAS_PTHREADS=1) - SET_TARGET_PROPERTIES(bvpl_octree PROPERTIES COMPILE_FLAGS -pthread) TARGET_LINK_LIBRARIES(bvpl_octree pthread) ENDIF( CMAKE_USE_PTHREADS_INIT ) Index: vxl-1.17.0/contrib/brl/bseg/bvpl_batch/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/bvpl_batch/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/brl/bseg/bvpl_batch/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -26,9 +26,6 @@ SET_TARGET_PROPERTIES(bvpl_batch PROPERTIES OUTPUT_NAME bvpl_batch DEBUG_POSTFIX _d SUFFIX .pyd) ENDIF(WIN32) SET_TARGET_PROPERTIES(bvpl_batch PROPERTIES PREFIX "") - IF(NOT WIN32) - SET_TARGET_PROPERTIES(bvpl_batch PROPERTIES COMPILE_FLAGS "-fPIC") - ENDIF(NOT WIN32) TARGET_LINK_LIBRARIES(bvpl_batch bprb brdb bpro_batch vbl bvpl bvpl_pro bvpl_kernels_pro bvxm_grid_pro bvxm_grid_io bvxm_algo_pro) Index: vxl-1.17.0/contrib/brl/bseg/bbgm_batch/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/bbgm_batch/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/brl/bseg/bbgm_batch/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -38,9 +38,6 @@ ENDIF(WIN32) SET_TARGET_PROPERTIES(bbgm_batch PROPERTIES PREFIX "") - IF(NOT WIN32) - SET_TARGET_PROPERTIES(bbgm_batch PROPERTIES COMPILE_FLAGS "-fPIC") - ENDIF(NOT WIN32) TARGET_LINK_LIBRARIES(bbgm_batch bprb brdb bpro_batch bbgm_pro vidl_pro vil_pro Index: vxl-1.17.0/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -25,9 +25,6 @@ SET_TARGET_PROPERTIES(bvpl_octree_batch PROPERTIES OUTPUT_NAME bvpl_octree_batch SUFFIX .so) ENDIF(APPLE) SET_TARGET_PROPERTIES(bvpl_octree_batch PROPERTIES PREFIX "") - IF(NOT WIN32) - SET_TARGET_PROPERTIES(bvpl_octree_batch PROPERTIES COMPILE_FLAGS "-fPIC") - ENDIF(NOT WIN32) TARGET_LINK_LIBRARIES(bvpl_octree_batch bvpl_octree_pro bvpl_kernels_pro bpro_batch boxm_pro boxm_algo_pro vpgl_io vpgl_pro vil_io vil_pro) Index: vxl-1.17.0/contrib/brl/bseg/bvxm_batch/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/bvxm_batch/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/brl/bseg/bvxm_batch/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -28,9 +28,6 @@ ENDIF (NOT CYGWIN) ENDIF(WIN32) SET_TARGET_PROPERTIES(bvxm_batch PROPERTIES PREFIX "") - IF(NOT WIN32) - SET_TARGET_PROPERTIES(bvxm_batch PROPERTIES COMPILE_FLAGS "-fPIC") - ENDIF(NOT WIN32) TARGET_LINK_LIBRARIES(bvxm_batch bprb brdb bpro_batch vbl bvxm bvxm_pro bvxm_io bvxm_grid_io bvxm_grid_pro vpgl_io vpgl_pro vil_io vil_pro sdet_pro) IF (PYTHON_DEBUG_LIBRARIES) Index: vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/tbl/vipl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/tbl/vipl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -68,14 +68,6 @@ # AUX_SOURCE_DIRECTORY(vipl_with_vnl_matrix/Templates vipl_sources) # AUX_SOURCE_DIRECTORY(vipl_with_section/Templates vipl_sources) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES( - vipl_with_section/Templates/vipl_filter_2d+section+vil1_rgb+uchar-.2-.section+vil1_rgb+uchar-.2-.vil1_rgb+uchar-.vil1_rgb+uchar--.cxx - PROPERTIES - COMPILE_FLAGS -O1 - ) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY(vipl ${vipl_sources}) SET_TARGET_PROPERTIES(vipl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib vipl) Index: vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/tbl/vepl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/tbl/vepl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -36,21 +36,6 @@ # [only when INSTANTIATE_TEMPLATES not defined:] # AUX_SOURCE_DIRECTORY(Templates vepl_sources) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(vepl_gaussian_convolution.cxx PROPERTIES COMPILE_FLAGS -O0) - SET_SOURCE_FILES_PROPERTIES(vepl_threshold.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(vepl_add_random_noise.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(vepl_dyadic.cxx PROPERTIES COMPILE_FLAGS -O0) - SET_SOURCE_FILES_PROPERTIES(vepl_dilate_disk.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(vepl_erode_disk.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(vepl_median.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(vepl_moment.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(vepl_histogram.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(Templates/vepl_convert+uchar-.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(Templates/vepl_convert+short-.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(Templates/vepl_convert+float-.cxx PROPERTIES COMPILE_FLAGS -O1) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY(vepl ${vepl_sources}) SET_TARGET_PROPERTIES(vepl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib vepl) Index: vxl-1.17.0/contrib/tbl/vepl/examples/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/tbl/vepl/examples/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/tbl/vepl/examples/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -23,8 +23,3 @@ ADD_EXECUTABLE(vepl_example2_threshold example2_threshold.cxx) ADD_EXECUTABLE(vepl_example_x_gradient example_x_gradient.cxx) ADD_EXECUTABLE(vepl_example_histogram example_histogram.cxx) - -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(example_convert.cxx PROPERTIES COMPILE_FLAGS -O0) - SET_SOURCE_FILES_PROPERTIES(example_std_dev.cxx PROPERTIES COMPILE_FLAGS -O0) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) Index: vxl-1.17.0/contrib/tbl/vepl1/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/tbl/vepl1/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/tbl/vepl1/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -30,20 +30,6 @@ # [only when INSTANTIATE_TEMPLATES not defined:] # AUX_SOURCE_DIRECTORY(Templates vepl1_sources) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(vepl1_threshold.cxx PROPERTIES COMPILE_FLAGS -O2) - SET_SOURCE_FILES_PROPERTIES(vepl1_add_random_noise.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(vepl1_dyadic.cxx PROPERTIES COMPILE_FLAGS -O3) - SET_SOURCE_FILES_PROPERTIES(vepl1_dilate_disk.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(vepl1_erode_disk.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(vepl1_median.cxx PROPERTIES COMPILE_FLAGS -O3) - SET_SOURCE_FILES_PROPERTIES(vepl1_moment.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(vepl1_histogram.cxx PROPERTIES COMPILE_FLAGS -O0) - SET_SOURCE_FILES_PROPERTIES(Templates/vepl1_convert+uchar-.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(Templates/vepl1_convert+short-.cxx PROPERTIES COMPILE_FLAGS -O1) - SET_SOURCE_FILES_PROPERTIES(Templates/vepl1_convert+float-.cxx PROPERTIES COMPILE_FLAGS -O1) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY(vepl1 ${vepl1_sources}) SET_TARGET_PROPERTIES(vepl1 PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib vepl1) Index: vxl-1.17.0/contrib/tbl/vepl1/examples/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/tbl/vepl1/examples/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/tbl/vepl1/examples/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -26,8 +26,3 @@ ADD_EXECUTABLE(vepl1_example2_threshold example2_threshold.cxx) ADD_EXECUTABLE(vepl1_example_x_gradient example_x_gradient.cxx) ADD_EXECUTABLE(vepl1_example_histogram example_histogram.cxx) - -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(example_convert.cxx PROPERTIES COMPILE_FLAGS -O0) - SET_SOURCE_FILES_PROPERTIES(example_std_dev.cxx PROPERTIES COMPILE_FLAGS -O3) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) Index: vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/gel/gevd/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/gel/gevd/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -28,10 +28,6 @@ gevd_region_proc_params.cxx gevd_region_proc_params.h ) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(gevd_contour.cxx PROPERTIES COMPILE_FLAGS -O0) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY(gevd ${gevd_sources}) SET_TARGET_PROPERTIES(gevd PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib gevd) Index: vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/gel/vtol/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/gel/vtol/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -30,10 +30,6 @@ AUX_SOURCE_DIRECTORY(Templates vtol_sources) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(vtol_two_chain.cxx PROPERTIES COMPILE_FLAGS -O1) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY(vtol ${vtol_sources}) SET_TARGET_PROPERTIES(vtol PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib vtol) Index: vxl-1.17.0/contrib/gel/vtol/tests/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/gel/vtol/tests/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/gel/vtol/tests/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -15,9 +15,6 @@ test_extract_topology.cxx ) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(test_cycle_processor.cxx PROPERTIES COMPILE_FLAGS -O1) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) TARGET_LINK_LIBRARIES( vtol_test_all vtol_algo vtol vsol vdgl vnl vil vul testlib ) Index: vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/oxl/mvl/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/oxl/mvl/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -108,10 +108,6 @@ ) AUX_SOURCE_DIRECTORY(Templates mvl_sources) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(FMatrixComputeRobust.cxx PROPERTIES COMPILE_FLAGS -O0) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_LIBRARY(mvl ${mvl_sources}) SET_TARGET_PROPERTIES(mvl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib mvl) Index: vxl-1.17.0/contrib/oxl/xcv/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/oxl/xcv/CMakeLists.txt 2013-11-28 13:56:51.000000000 +0100 +++ vxl-1.17.0/contrib/oxl/xcv/CMakeLists.txt 2013-11-28 13:57:10.000000000 +0100 @@ -25,11 +25,6 @@ xcv_axes_limits.cxx xcv_axes_limits.h ) -IF(CMAKE_COMPILER_IS_GNUCXX) - SET_SOURCE_FILES_PROPERTIES(xcv_geometry.cxx PROPERTIES COMPILE_FLAGS "-O0 -ftemplate-depth-100") - SET_SOURCE_FILES_PROPERTIES(xcv_multiview.cxx PROPERTIES COMPILE_FLAGS -O0) -ENDIF(CMAKE_COMPILER_IS_GNUCXX) - ADD_EXECUTABLE(xcv ${xcv_sources}) INSTALL_TARGETS(/bin xcv) TARGET_LINK_LIBRARIES(xcv oxl_osl mvl vgui vgl vil1 vnl vul vcl) debian/patches/series0000644000000000000000000000056612245636771012056 0ustar fixcompilation2.patch vxl.soname.patch fixingupstream.patch moresoname.patch fixxerces.patch bug708358.patch bug707472.patch libav_trunk.patch renamelibs.patch fix_alphacomp.patch ffmpeg_C99.patch sse2.patch opencl_unix.patch ocl_comp.patch remove_contrib_testing.patch ocl.soname.patch opencl_kfreebsd.patch shared-lib-without-dependency-information.patch #compflags.patch debian/patches/install_doxygen.patch0000644000000000000000000000327211770050647015054 0ustar Description: doxygen.cmake would not be installed otherwise Author: Mathieu Malaterre Last-Update: 2011-07-24 Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=28366141 Index: vxl-1.14.0/config/cmake/export/CMakeLists.txt =================================================================== --- vxl-1.14.0.orig/config/cmake/export/CMakeLists.txt 2009-12-11 18:29:13.000000000 +0100 +++ vxl-1.14.0/config/cmake/export/CMakeLists.txt 2011-12-08 11:36:10.000000000 +0100 @@ -49,4 +49,5 @@ ${VXL_CMAKE_DIR}/VXLStandardOptions.cmake ${VXL_CMAKE_DIR}/UseVXL.cmake ${VXL_CMAKE_DIR}/UseVGUI.cmake + ${VXL_CMAKE_DIR}/../doxygen/doxygen.cmake ) Index: vxl-1.14.0/config/cmake/Modules/VXLConfig_export.cmake.in =================================================================== --- vxl-1.14.0.orig/config/cmake/Modules/VXLConfig_export.cmake.in 2011-12-08 11:43:52.000000000 +0100 +++ vxl-1.14.0/config/cmake/Modules/VXLConfig_export.cmake.in 2011-12-08 11:44:37.000000000 +0100 @@ -41,6 +41,11 @@ # Clients projects should not use the Find*.cmake files in this directory. SET(VXL_CMAKE_DIR "@CMAKE_INSTALL_PREFIX@/share/vxl/cmake") +# Doxygen Support +SET(VXL_CMAKE_DOXYGEN_DIR "@CMAKE_INSTALL_PREFIX@/share/vxl/cmake") + + + # VXL Configuration options. You don't have to build with the same options as VXL, but it often helps. SET(VXL_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@") SET(VXL_BUILD_TESTS "@BUILD_TESTS@") @@ -206,3 +211,5 @@ SET(VXL_FORCE_V3P_GEOTIFF_deprecated "@VXL_FORCE_V3P_GEOTIFF@") SET(VXL_FORCE_V3P_PNG_deprecated "@VXL_FORCE_V3P_PNG@") SET(VXL_FORCE_V3P_MPEG2_deprecated "@VXL_FORCE_V3P_MPEG2@") +SET(VXL_FORCE_V3P_RPLY_deprecated "@VXL_FORCE_V3P_RPLY@") + debian/patches/fix_alphacomp.patch0000644000000000000000000000510512146157033014453 0ustar Description: __alpha is a processor, not an OS Author: Mathieu Malaterre Last-Update: 2011-12-12 Forwarded: http://sourceforge.net/mailarchive/message.php?msg_id=28569493 Bug: https://sourceforge.net/apps/trac/vxl/ticket/66 Index: vxl-1.17.0/v3p/Qv/QvDict.cxx =================================================================== --- vxl-1.17.0.orig/v3p/Qv/QvDict.cxx 2013-05-19 13:36:32.070525549 +0000 +++ vxl-1.17.0/v3p/Qv/QvDict.cxx 2013-05-19 13:36:32.062525549 +0000 @@ -9,7 +9,7 @@ # endif #else # if defined(__alpha) /* there is no inttypes.h here */ - typedef unsigned long intptr_t; +// typedef unsigned long intptr_t; # elif defined(__CYGWIN__) # include /* for intptr_t on Cygwin */ # elif defined(__BORLANDC__) Index: vxl-1.17.0/core/vil/vil_stream_url.cxx =================================================================== --- vxl-1.17.0.orig/core/vil/vil_stream_url.cxx 2013-05-19 13:36:32.070525549 +0000 +++ vxl-1.17.0/core/vil/vil_stream_url.cxx 2013-05-19 13:36:32.066525549 +0000 @@ -25,7 +25,7 @@ # include # include // htons() # ifdef __alpha -# include // htons() [ on e.g. DEC alpha, htons is in machine/endian.h] +//# include // htons() [ on e.g. DEC alpha, htons is in machine/endian.h] # endif # define SOCKET int #elif defined (VCL_WIN32) && !defined(__CYGWIN__) Index: vxl-1.17.0/core/vil1/vil1_stream_url.cxx =================================================================== --- vxl-1.17.0.orig/core/vil1/vil1_stream_url.cxx 2013-05-19 13:36:32.070525549 +0000 +++ vxl-1.17.0/core/vil1/vil1_stream_url.cxx 2013-05-19 13:36:32.066525549 +0000 @@ -24,7 +24,7 @@ # include # include // htons() # ifdef __alpha -# include // htons() [ on e.g. DEC alpha, htons is in machine/endian.h] +//# include // htons() [ on e.g. DEC alpha, htons is in machine/endian.h] # endif # define SOCKET int #elif defined (VCL_WIN32) && !defined(__CYGWIN__) Index: vxl-1.17.0/core/vul/vul_url.cxx =================================================================== --- vxl-1.17.0.orig/core/vul/vul_url.cxx 2013-05-19 13:36:32.070525549 +0000 +++ vxl-1.17.0/core/vul/vul_url.cxx 2013-05-19 13:36:32.066525549 +0000 @@ -27,7 +27,7 @@ # include # include // htons() # ifdef __alpha -# include // htons() [ on e.g. DEC alpha, htons is in machine/endian.h ] +//# include // htons() [ on e.g. DEC alpha, htons is in machine/endian.h ] # endif # define SOCKET int debian/patches/fixingupstream.patch0000644000000000000000000005615512067602663014727 0ustar Description: adding SONAME to library to be public (3) Author: Mathieu Malaterre Last-Update: 2012-12-29 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}) +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 ) 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}) - +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) 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}) - +SET_TARGET_PROPERTIES(vpgl_file_formats PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(vpgl_file_formats vpgl vil vnl) IF( BUILD_TESTING ) 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}) - +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 ) 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 ) +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}) 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}) +SET_TARGET_PROPERTIES(vgl_xio PROPERTIES ${VNL_LIBRARY_PROPERTIES}) IF(NOT WIN32) SET_TARGET_PROPERTIES(vgl_xio PROPERTIES COMPILE_FLAGS "-fPIC") ENDIF(NOT WIN32) 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}) +SET_TARGET_PROPERTIES(vpl PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES}) IF(NOT WIN32) SET_TARGET_PROPERTIES(vpl PROPERTIES COMPILE_FLAGS "-fPIC") ENDIF(NOT WIN32) 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}) +SET_TARGET_PROPERTIES(rrel PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib rrel) INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/rpl/rrel ${rrel_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}) - +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 ) 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}) +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) 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) +SET_TARGET_PROPERTIES(boxm2_io PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES}) #install the .h .txx and libs INSTALL_TARGETS(/lib boxm2_io) 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}) +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 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}) 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) 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}) +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 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}) +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) 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}) IF( BUILD_TESTING ) SUBDIRS(tests) 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}) IF( BUILD_TESTING ) SUBDIRS(tests) 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}) IF( BUILD_TESTING ) SUBDIRS(tests) 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}) +SET_TARGET_PROPERTIES(bwm_io PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(bwm_io vsol vsl vbl) 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}) +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 ) 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}) +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) 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}) +SET_TARGET_PROPERTIES(baio PROPERTIES ${VNL_LIBRARY_PROPERTIES}) IF(APPLE) TARGET_LINK_LIBRARIES(baio c) 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}) +SET_TARGET_PROPERTIES(bvrml PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(bvrml vgl) @@ -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}) 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}) +SET_TARGET_PROPERTIES(bsta_io PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(bsta_io bsta vnl_io vbl_io vbl) IF( BUILD_TESTING ) 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} ) +SET_TARGET_PROPERTIES(bsta_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(bsta_algo bsta vnl_algo vnl vbl) IF( BUILD_TESTING ) 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} ) +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) 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) +SET_TARGET_PROPERTIES(vsph PROPERTIES ${VNL_LIBRARY_PROPERTIES}) IF(BUILD_TESTING) SUBDIRS(tests) @@ -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}) 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) 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 ) 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}) +SET_TARGET_PROPERTIES(brad_io PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(brad_io brad vnl_io vbl_io vbl) IF( BUILD_TESTING ) 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}) +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 @@ 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}) 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}) - +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) 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}) +SET_TARGET_PROPERTIES(imesh PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(imesh vgl vul brdb vbl_io vbl) 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) SET_TARGET_PROPERTIES(minizip PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS( /lib minizip ) INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/b3p/minizip ${minizip_sources}) 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) +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}) 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}) +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) 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}) +SET_TARGET_PROPERTIES(rply PROPERTIES ${V3P_NETLIB_LIBRARY_PROPERTIES}) #install the .h .txx and libs INSTALL_TARGETS(/lib rply) 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) SET_TARGET_PROPERTIES(openjpeg2 PROPERTIES VERSION 2.0.0 DEFINE_SYMBOL OPJ_EXPORTS) debian/patches/libav_trunk.patch0000644000000000000000000000627412144721561014172 0ustar Description: FTBFS with libav 0.9 (Debian experimental and Ubuntu raring) Author: Fabrice Coutadeur Bug-Debian: http://bugs.debian.org/693543 Forwarded: no Index: vxl-1.17.0/core/vidl/vidl_ffmpeg_ostream_v4.txx =================================================================== --- vxl-1.17.0.orig/core/vidl/vidl_ffmpeg_ostream_v4.txx 2013-05-15 16:57:56.171429064 +0200 +++ vxl-1.17.0/core/vidl/vidl_ffmpeg_ostream_v4.txx 2013-05-15 16:58:36.183428612 +0200 @@ -25,11 +25,21 @@ extern "C" { #if FFMPEG_IN_SEVERAL_DIRECTORIES #include +#include #else #include #endif } +// Define deprecated codec flags as private +#define CODEC_FLAG_H263P_UMV 0x02000000 ///< unlimited motion vector +#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000 +#define CODEC_FLAG_H263P_AIV 0x00000008 ///< H.263 alternative inter VLC +#define CODEC_FLAG_OBMC 0x00000001 ///< OBMC +#define CODEC_FLAG_PART 0x0080 ///< Use data partitioning. +#define CODEC_FLAG_ALT_SCAN 0x00100000 ///< Use alternate scan. +#define CODEC_FLAG_SVCD_SCAN_OFFSET 0x40000000 ///< Will reserve space for SVCD scan offset user data. + //----------------------------------------------------------------------------- @@ -117,7 +127,7 @@ os_->fmt_cxt_->nb_streams = 0; // Create stream - AVStream* st = av_new_stream( os_->fmt_cxt_, 0 ); + AVStream* st = avformat_new_stream( os_->fmt_cxt_, 0 ); if ( !st ) { vcl_cerr << "ffmpeg: could not alloc stream\n"; close(); @@ -229,7 +239,7 @@ if (params_.video_qscale_ || params_.same_quality_) { video_enc->flags |= CODEC_FLAG_QSCALE; - st->quality = FF_QP2LAMBDA * params_.video_qscale_; + video_enc->global_quality = FF_QP2LAMBDA * params_.video_qscale_; } // if (bitexact) // video_enc->flags |= CODEC_FLAG_BITEXACT; @@ -377,7 +387,7 @@ vcl_strncpy( os_->fmt_cxt_->filename, filename_.c_str(), 1023 ); - if ( avio_open( &os_->fmt_cxt_->pb, filename_.c_str(), URL_WRONLY) < 0 ) + if ( avio_open( &os_->fmt_cxt_->pb, filename_.c_str(), AVIO_FLAG_WRITE) < 0 ) { vcl_cerr << "ffmpeg: couldn't open " << filename_ << " for writing\n"; close(); @@ -387,7 +397,7 @@ //dump_format( os_->fmt_cxt_, 1, filename_, 1 ); - if ( avcodec_open( video_enc, codec ) < 0 ) + if ( avcodec_open2( video_enc, codec, NULL ) < 0 ) { vcl_cerr << "ffmpeg: couldn't open codec\n"; close(); Index: vxl-1.17.0/core/vidl/vidl_ffmpeg_istream_v3.txx =================================================================== --- vxl-1.17.0.orig/core/vidl/vidl_ffmpeg_istream_v3.txx 2013-05-15 16:57:56.195429062 +0200 +++ vxl-1.17.0/core/vidl/vidl_ffmpeg_istream_v3.txx 2013-05-15 16:58:36.183428612 +0200 @@ -143,7 +143,7 @@ } // Get the stream information by reading a bit of the file - if ( av_find_stream_info( is_->fmt_cxt_ ) < 0 ) { + if ( avformat_find_stream_info( is_->fmt_cxt_, NULL ) < 0 ) { return false; } @@ -165,7 +165,7 @@ // Open the stream AVCodec* codec = avcodec_find_decoder(enc->codec_id); - if ( !codec || avcodec_open( enc, codec ) < 0 ) { + if ( !codec || avcodec_open2( enc, codec, NULL ) < 0 ) { return false; } debian/patches/moresoname.patch0000644000000000000000000001057112067602612014011 0ustar Description: adding SONAME to library to be public (2) Author: Mathieu Malaterre Last-Update: 2012-12-29 --- vxl-1.17.0.orig/contrib/brl/bpro/core/brad_pro/CMakeLists.txt +++ vxl-1.17.0/contrib/brl/bpro/core/brad_pro/CMakeLists.txt @@ -14,6 +14,7 @@ AUX_SOURCE_DIRECTORY(Templates brad_pro_ AUX_SOURCE_DIRECTORY(processes brad_pro_sources) ADD_LIBRARY(brad_pro ${brad_pro_sources} ) +SET_TARGET_PROPERTIES(brad_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(brad_pro brad_io brad bprb brdb brip vbl_io vbl vil_pro) --- vxl-1.17.0.orig/contrib/brl/bbas/bsl/CMakeLists.txt +++ vxl-1.17.0/contrib/brl/bbas/bsl/CMakeLists.txt @@ -16,6 +16,7 @@ SET(bsl_sources AUX_SOURCE_DIRECTORY(Templates bsl_sources) ADD_LIBRARY(bsl ${bsl_sources}) +SET_TARGET_PROPERTIES(bsl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib bsl) INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bbas/bsl ${bsl_sources}) TARGET_LINK_LIBRARIES(bsl vnl vbl) --- vxl-1.17.0.orig/contrib/brl/bbas/bwm/CMakeLists.txt +++ vxl-1.17.0/contrib/brl/bbas/bwm/CMakeLists.txt @@ -110,6 +110,7 @@ ENDIF(MFC_FOUND) AUX_SOURCE_DIRECTORY(Templates bwm_sources) ADD_LIBRARY(bwm ${bwm_sources}) +SET_TARGET_PROPERTIES(bwm PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES( bwm bwm_video bwm_reg bwm_algo bwm_io vsph bsta_io bmsh3d bmsh3d_algo bsol vsol vdgl bgui vgui vil vbl vgl vgl_algo vnl_algo vnl vpgl vpgl_algo vpgl_io vpgl_file_formats bvgl vul ) --- vxl-1.17.0.orig/contrib/brl/bbas/bvrml/pro/CMakeLists.txt +++ vxl-1.17.0/contrib/brl/bbas/bvrml/pro/CMakeLists.txt @@ -14,6 +14,7 @@ AUX_SOURCE_DIRECTORY(processes bvrml_pro AUX_SOURCE_DIRECTORY(Templates bvrml_pro_sources) ADD_LIBRARY(bvrml_pro ${bvrml_pro_sources} ) +SET_TARGET_PROPERTIES(bvrml_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(bvrml_pro bvrml vpgl_algo vpgl_io bprb ) --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/reg/CMakeLists.txt +++ vxl-1.17.0/contrib/brl/bseg/boxm2/reg/CMakeLists.txt @@ -10,6 +10,7 @@ SET(boxm2_reg_sources ) ADD_LIBRARY(boxm2_reg ${boxm2_reg_sources}) +SET_TARGET_PROPERTIES(boxm2_reg PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(boxm2_reg boxm2 boxm2_io brip 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/boxm2/class/CMakeLists.txt +++ vxl-1.17.0/contrib/brl/bseg/boxm2/class/CMakeLists.txt @@ -10,6 +10,7 @@ SET(boxm2_class_sources ) ADD_LIBRARY(boxm2_class ${boxm2_class_sources}) +SET_TARGET_PROPERTIES(boxm2_class PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(boxm2_class boxm2 bvgl 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/boxm2/pro/CMakeLists.txt +++ vxl-1.17.0/contrib/brl/bseg/boxm2/pro/CMakeLists.txt @@ -36,6 +36,7 @@ IF(EXPAT_FOUND) ENDIF(GEOTIFF_FOUND) ADD_LIBRARY(boxm2_pro ${boxm2_pro_sources}) + SET_TARGET_PROPERTIES(boxm2_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES}) #install the .h .txx and libs INSTALL_TARGETS(/lib boxm2_pro) --- vxl-1.17.0.orig/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt +++ vxl-1.17.0/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt @@ -28,6 +28,7 @@ SET(bvpl_kernels_sources AUX_SOURCE_DIRECTORY(Templates bvpl_kernels_sources) ADD_LIBRARY(bvpl_kernels ${bvpl_kernels_sources}) +SET_TARGET_PROPERTIES(bvpl_kernels PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(bvpl_kernels bxml bsvg bsta vgl_algo vgl vnl vbl) #Directory with python/c++ processes --- vxl-1.17.0.orig/contrib/brl/bseg/bmrf/CMakeLists.txt +++ vxl-1.17.0/contrib/brl/bseg/bmrf/CMakeLists.txt @@ -23,6 +23,7 @@ SET(bmrf_sources AUX_SOURCE_DIRECTORY(Templates bmrf_sources) ADD_LIBRARY(bmrf ${bmrf_sources}) +SET_TARGET_PROPERTIES(bmrf PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib bmrf) INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/brl/bseg/bmrf ${bmrf_sources}) --- vxl-1.17.0.orig/contrib/tbl/vepl1/CMakeLists.txt +++ vxl-1.17.0/contrib/tbl/vepl1/CMakeLists.txt @@ -45,6 +45,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX) ENDIF(CMAKE_COMPILER_IS_GNUCXX) ADD_LIBRARY(vepl1 ${vepl1_sources}) +SET_TARGET_PROPERTIES(vepl1 PROPERTIES ${VNL_LIBRARY_PROPERTIES}) INSTALL_TARGETS(/lib vepl1) INSTALL_NOBASE_HEADER_FILES(/include/vxl/contrib/tbl/vepl1 ${vepl1_sources}) TARGET_LINK_LIBRARIES(vepl1 vipl vil1 ${CMAKE_THREAD_LIBS}) debian/patches/remove_contrib_testing.patch0000644000000000000000000000150412151104436016405 0ustar Description: remove test from contrib section Most tests from contrib are failing anyway. Furthermore boxm_scene_to_bvxm_grid loops for ever So this patch deactive any test within the contrib section. According to upstream test within the 'core' vxl are supposed to run. ref: https://sourceforge.net/mailarchive/message.php?msg_id=30891566 Author: Mathieu Malaterre Forwarded: not-needed Index: vxl-1.17.0/contrib/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/CMakeLists.txt 2013-05-28 11:36:10.000000000 +0200 +++ vxl-1.17.0/contrib/CMakeLists.txt 2013-05-28 11:36:10.000000000 +0200 @@ -1,3 +1,4 @@ +set(BUILD_TESTING OFF) # This is contrib/CMakeLists.txt # Dependencies: mul --> (rpl,tbl); oxl --> gel --> brl; (gel,oxl) --> conversions debian/patches/sse2.patch0000644000000000000000000000771112146157033012522 0ustar From: Tom Vercauteren Date: Tue, 19 May 2009 09:29:23 -0400 Subject: [PATCH] COMP: Use vanilla implementation in rounding function when gcc-xml is used --- Utilities/vxl/core/vnl/vnl_math.h | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) Origin: vendor, http://itk.org/gitweb?p=ITK.git;a=commit;h=b106984 Last-Update: 2012-12-20 Index: vxl-1.17.0/core/vnl/vnl_math.h =================================================================== --- vxl-1.17.0.orig/core/vnl/vnl_math.h 2012-03-16 16:27:06.000000000 +0100 +++ vxl-1.17.0/core/vnl/vnl_math.h 2013-05-19 16:08:53.018518890 +0200 @@ -44,16 +44,20 @@ #endif // Figure out when the fast implementation can be used -#if VNL_CONFIG_ENABLE_SSE2_ROUNDING +#if VNL_CONFIG_ENABLE_SSE2_ROUNDING && defined(__SSE2__) # if !VXL_HAS_EMMINTRIN_H # error "Required file emmintrin.h for SSE2 not found" # else # include // sse 2 intrinsics +# define USE_SSE2_IMPL 1 # endif +#else +# define USE_SSE2_IMPL 0 #endif // Turn on fast impl when using GCC on Intel-based machines with the following exception: // PPC with Mac OS X -#if defined(__GNUC__) && (!defined(__APPLE__) || !defined(__ppc__) ) +// GCCXML +#if defined(__GNUC__) && (defined(__i386__) || defined(__i386) || defined(__x86_64__) || defined(__x86_64)) && (!defined(__APPLE__) || !defined(__ppc__) ) # define GCC_USE_FAST_IMPL 1 #else # define GCC_USE_FAST_IMPL 0 @@ -201,7 +205,7 @@ // We assume that the rounding mode is not changed from the default // one (or at least that it is always restored to the default one). -#if VNL_CONFIG_ENABLE_SSE2_ROUNDING // Fast sse2 implementation +#if USE_SSE2_IMPL // Fast sse2 implementation inline int vnl_math_rnd_halfinttoeven(float x) { @@ -312,7 +316,7 @@ // We also assume that the rounding mode is not changed from the default // one (or at least that it is always restored to the default one). -#if VNL_CONFIG_ENABLE_SSE2_ROUNDING || GCC_USE_FAST_IMPL || VC_USE_FAST_IMPL +#if USE_SSE2_IMPL || GCC_USE_FAST_IMPL || VC_USE_FAST_IMPL inline int vnl_math_rnd_halfintup(float x) { return vnl_math_rnd_halfinttoeven(2*x+0.5f)>>1; } inline int vnl_math_rnd_halfintup(double x) { return vnl_math_rnd_halfinttoeven(2*x+0.5)>>1; } @@ -345,7 +349,7 @@ // We assume that the rounding mode is not changed from the default // one (or at least that it is always restored to the default one). -#if VNL_CONFIG_ENABLE_SSE2_ROUNDING || GCC_USE_FAST_IMPL || VC_USE_FAST_IMPL +#if USE_SSE2_IMPL || GCC_USE_FAST_IMPL || VC_USE_FAST_IMPL inline int vnl_math_rnd(float x) { return vnl_math_rnd_halfinttoeven(x); } inline int vnl_math_rnd(double x) { return vnl_math_rnd_halfinttoeven(x); } @@ -367,7 +371,7 @@ // We also assume that the rounding mode is not changed from the default // one (or at least that it is always restored to the default one). -#if VNL_CONFIG_ENABLE_SSE2_ROUNDING // Fast sse2 implementation +#if USE_SSE2_IMPL // Fast sse2 implementation inline int vnl_math_floor(float x) { @@ -452,7 +456,7 @@ // We also assume that the rounding mode is not changed from the default // one (or at least that it is always restored to the default one). -#if VNL_CONFIG_ENABLE_SSE2_ROUNDING // Fast sse2 implementation +#if USE_SSE2_IMPL // Fast sse2 implementation inline int vnl_math_ceil(float x) { Index: vxl-1.17.0/core/vil/vil_round.h =================================================================== --- vxl-1.17.0.orig/core/vil/vil_round.h 2009-05-08 17:47:55.000000000 +0200 +++ vxl-1.17.0/core/vil/vil_round.h 2013-05-19 16:08:53.042518890 +0200 @@ -25,9 +25,10 @@ # endif #endif +#define DEFINED_INTEL (defined(__i386__) || defined(__x86_64__)) // Turn on fast impl when using GCC on Intel-based machines with the following exception: // PPC with Mac OS X -#if defined(__GNUC__) && (!defined(__APPLE__) || !defined(__ppc__) ) +#if defined(__GNUC__) && DEFINED_INTEL # define GCC_USE_FAST_IMPL 1 #else # define GCC_USE_FAST_IMPL 0 debian/patches/ffmpeg_C99.patch0000644000000000000000000000133312146157033013530 0ustar Description: Added a missing STD_CONSTANT_MACROS check in vidl_ffmpeg_convert Forwarded: not-needed Origin: upstream, http://vxl.svn.sf.net/viewvc/vxl?view=revision&revision=31498 Author: Chuck Atkins Last-Update: 2012-12-20 Index: vxl-1.17.0/core/vidl/tests/test_include.cxx =================================================================== --- vxl-1.17.0.orig/core/vidl/tests/test_include.cxx 2013-05-19 13:37:24.126525372 +0000 +++ vxl-1.17.0/core/vidl/tests/test_include.cxx 2013-05-19 13:37:24.122525372 +0000 @@ -1,3 +1,4 @@ +#define __STDC_CONSTANT_MACROS #include // needed for VIDL_HAS_FFMPEG etc. #include #include debian/patches/fixxerces.patch0000644000000000000000000000070612067603267013652 0ustar Description: Help cmake find xerces headers Author: Mathieu Malaterre --- vxl-1.17.0.orig/contrib/brl/bmods/find_xerces.cmake +++ vxl-1.17.0/contrib/brl/bmods/find_xerces.cmake @@ -6,6 +6,7 @@ # FIND_PATH(XERCES_BXML_INCLUDE_PATH dom/DOM.hpp +/usr/include/xercesc/ ${vxl_SOURCE_DIR}/../xerces-c-src1_4_0/include /usr/local/xerces-c-src1_4_0/include ${vxl_SOURCE_DIR}/v3p/xerces-c-src1_4_0/include debian/patches/ocl.soname.patch0000644000000000000000000000635412151115277013706 0ustar Description: ocl libs needs SONAME Author: Mathieu Malaterre Forwarded: not-needed Index: vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/CMakeLists.txt 2013-05-28 11:52:53.570907869 +0000 +++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/CMakeLists.txt 2013-05-28 11:52:53.562907870 +0000 @@ -26,6 +26,7 @@ ADD_LIBRARY(boxm2_ocl ${boxm2_ocl_sources}) TARGET_LINK_LIBRARIES(boxm2_ocl boxm2 boxm2_basic boxm2_io bocl boct bsta brdb expatpp vpgl vgl_xio vgl vil vnl_algo vnl vbl_io vbl vsl vcl) +SET_TARGET_PROPERTIES(boxm2_ocl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) #install the .h .txx and libs INSTALL_TARGETS(/lib boxm2_ocl) Index: vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/algo/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/algo/CMakeLists.txt 2013-05-28 11:52:53.570907869 +0000 +++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/algo/CMakeLists.txt 2013-05-28 11:52:53.562907870 +0000 @@ -17,6 +17,7 @@ ADD_LIBRARY(boxm2_ocl_algo ${boxm2_ocl_algo_sources}) TARGET_LINK_LIBRARIES(boxm2_ocl_algo boxm2_ocl vgl vil vul) +SET_TARGET_PROPERTIES(boxm2_ocl_algo PROPERTIES ${VNL_LIBRARY_PROPERTIES}) #tests IF( BUILD_TESTING ) Index: vxl-1.17.0/contrib/brl/bbas/bocl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bbas/bocl/CMakeLists.txt 2013-05-28 11:52:53.570907869 +0000 +++ vxl-1.17.0/contrib/brl/bbas/bocl/CMakeLists.txt 2013-05-28 11:52:53.562907870 +0000 @@ -18,6 +18,7 @@ ) AUX_SOURCE_DIRECTORY(Templates bocl_sources) ADD_LIBRARY(bocl ${bocl_sources} ) + SET_TARGET_PROPERTIES(bocl PROPERTIES ${VNL_LIBRARY_PROPERTIES}) TARGET_LINK_LIBRARIES(bocl brdb vnl vnl_algo vbl_io vpgl vgl vil vbl vul ${OPENCL_LIBRARIES}) Index: vxl-1.17.0/contrib/brl/bseg/boxm2/reg/ocl/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/reg/ocl/CMakeLists.txt 2013-05-28 11:52:53.570907869 +0000 +++ vxl-1.17.0/contrib/brl/bseg/boxm2/reg/ocl/CMakeLists.txt 2013-05-28 11:52:53.562907870 +0000 @@ -15,6 +15,7 @@ ADD_LIBRARY(boxm2_ocl_reg ${boxm2_ocl_reg_sources}) TARGET_LINK_LIBRARIES(boxm2_ocl_reg boxm2_io boxm2_reg boxm2_ocl bocl brip baio vpgl vnl vidl vil_algo vil vgl_algo vgl_xio vgl vbl vul vsl vcl) +SET_TARGET_PROPERTIES(boxm2_ocl_reg PROPERTIES ${VNL_LIBRARY_PROPERTIES}) #install the .h .txx and libs INSTALL_TARGETS(/lib boxm2_ocl_reg) Index: vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt =================================================================== --- vxl-1.17.0.orig/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt 2013-05-28 11:52:53.570907869 +0000 +++ vxl-1.17.0/contrib/brl/bseg/boxm2/ocl/pro/CMakeLists.txt 2013-05-28 11:52:53.562907870 +0000 @@ -29,6 +29,7 @@ ADD_LIBRARY(boxm2_ocl_pro ${boxm2_ocl_pro_sources}) TARGET_LINK_LIBRARIES(boxm2_ocl_pro boxm2_ocl_algo boct brdb vbl_io expatpp vpgl vgl vgl_xio vil vul vbl vsl vcl bvpl_kernels) TARGET_LINK_LIBRARIES(boxm2_ocl_pro bsta_algo) +SET_TARGET_PROPERTIES(boxm2_ocl_pro PROPERTIES ${VNL_LIBRARY_PROPERTIES}) #tests IF( BUILD_TESTING ) debian/patches/opencl_kfreebsd.patch0000644000000000000000000000100112151634543014757 0ustar Description: file was not portable on kFreeBSD Author: Mathieu Malaterre Forwarded: no --- vxl-1.17.0.orig/contrib/brl/bbas/bocl/bocl_cl.h +++ vxl-1.17.0/contrib/brl/bbas/bocl/bocl_cl.h @@ -13,7 +13,7 @@ // \endverbatim #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || \ - defined(UNIX) || defined(linux) + defined(UNIX) || defined(linux) || defined(__FreeBSD_kernel__) #include #include #define GL_SHARING_EXTENSION "cl_khr_gl_sharing" debian/patches/shared-lib-without-dependency-information.patch0000644000000000000000000000254512245636771022033 0ustar Description: lintian is running ldd on three libs: usr/lib/x86_64-linux-gnu/libvil3d_io.so.1.17.0 usr/lib/x86_64-linux-gnu/libvimt_algo.so.1.17.0 usr/lib/x86_64-linux-gnu/libvipl.so.1.17. ldd thinks those are statically linked... let's add some dummy symbols in the shared libs to avoid this lintian warning Author: Mathieu Malaterre Forwarded: no Index: vxl-1.17.0/contrib/mul/vil3d/io/vil3d_io_dummy.cxx =================================================================== --- vxl-1.17.0.orig/contrib/mul/vil3d/io/vil3d_io_dummy.cxx 2013-11-28 13:47:13.000000000 +0100 +++ vxl-1.17.0/contrib/mul/vil3d/io/vil3d_io_dummy.cxx 2013-11-28 13:47:52.000000000 +0100 @@ -5,7 +5,5 @@ // This file merely creates some code so that MSVC and other compilers will actually produce a library. -#ifdef _MSC_VER char * vil3d_io_dummy = "dummy"; -#endif Index: vxl-1.17.0/contrib/mul/vimt/algo/vimt_dummy.cxx =================================================================== --- vxl-1.17.0.orig/contrib/mul/vimt/algo/vimt_dummy.cxx 2013-11-28 13:47:13.000000000 +0100 +++ vxl-1.17.0/contrib/mul/vimt/algo/vimt_dummy.cxx 2013-11-28 13:47:52.000000000 +0100 @@ -4,6 +4,4 @@ // \author Ian Scott // This file merely creates some code so that MSVC and other compilers will actually produce a library. -#ifdef _MSC_VER char * vimt_algo_dummy = "dummy"; -#endif debian/patches/opencl_unix.patch0000644000000000000000000000170712150652617014173 0ustar Description: opencl package on debian was not supported Author: Mathieu Malaterre Last-Update: 2011-07-24 Bug: http://sourceforge.net/apps/trac/vxl/ticket/64 Index: vxl-1.17.0/config/cmake/Modules/NewCMake/FindOpenCL.cmake =================================================================== --- vxl-1.17.0.orig/config/cmake/Modules/NewCMake/FindOpenCL.cmake 2010-11-01 03:33:00.000000000 +0000 +++ vxl-1.17.0/config/cmake/Modules/NewCMake/FindOpenCL.cmake 2013-05-27 12:33:00.491853556 +0000 @@ -71,7 +71,7 @@ IF (UNIX) FIND_PATH( OPENCL_INCLUDE_PATH CL/cl_gl.h PATHS /usr/include /usr/include/nvidia-current) - FIND_PATH(OPENCL_LIBRARY_PATH libOpenCL.so PATHS /usr/lib /usr/lib/nvidia-current) + FIND_LIBRARY(OPENCL_LIBRARY_PATH NAMES libOpenCL.so PATHS /usr/lib /usr/lib/nvidia-current) FIND_LIBRARY(OPENCL_LIBRARIES NAMES libOpenCL.so PATHS /usr/lib /usr/lib/nvidia-current) IF (OPENCL_INCLUDE_PATH) IF (OPENCL_LIBRARY_PATH)