[med-svn] r8835 - trunk/packages/vxl/trunk/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-12-08 10:45:20 +0000 (Thu, 08 Dec 2011)
New Revision: 8835

Modified:
   trunk/packages/vxl/trunk/debian/patches/install_doxygen.patch
Log:
Fix doxygen.cmake installation

Modified: trunk/packages/vxl/trunk/debian/patches/install_doxygen.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/install_doxygen.patch	2011-12-08 10:11:48 UTC (rev 8834)
+++ trunk/packages/vxl/trunk/debian/patches/install_doxygen.patch	2011-12-08 10:45:20 UTC (rev 8835)
@@ -1,10 +1,32 @@
 Index: vxl-1.14.0/config/cmake/export/CMakeLists.txt
 ===================================================================
---- vxl-1.14.0.orig/config/cmake/export/CMakeLists.txt	2011-12-07 18:57:14.000000000 +0100
-+++ vxl-1.14.0/config/cmake/export/CMakeLists.txt	2011-12-07 18:57:28.000000000 +0100
+--- 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}/config/cmake/doxygen/doxygen.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 "@VXL_CMAKE_DOXYGEN_DIR@")
++
++
++
+ # 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@")
++