[med-svn] r2895 - trunk/packages/igstk/trunk/debian/patches

[domibel-guest at alioth.debian.org]

Author: domibel-guest
Date: 2009-01-04 06:06:54 +0000 (Sun, 04 Jan 2009)
New Revision: 2895

Added:
   trunk/packages/igstk/trunk/debian/patches/90_examples.dpatch
Removed:
   trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch
Modified:
   trunk/packages/igstk/trunk/debian/patches/00list
Log:
added cmake variables for the examples


Modified: trunk/packages/igstk/trunk/debian/patches/00list
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/00list	2009-01-04 05:38:15 UTC (rev 2894)
+++ trunk/packages/igstk/trunk/debian/patches/00list	2009-01-04 06:06:54 UTC (rev 2895)
@@ -1,2 +1,2 @@
 70_vtk_use_qvtk.dpatch
-90_cmake_minimum_required.dpatch
+90_examples.dpatch

Deleted: trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch	2009-01-04 05:38:15 UTC (rev 2894)
+++ trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch	2009-01-04 06:06:54 UTC (rev 2895)
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_cmake_minimum_required.dpatch by  <domibel at sid1500>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makes the example cmake 2.6 ready, The example can now be built from outside the source directory
-
- at DPATCH@
-diff -urNad igstk-3.0.0~cvs20080716~/Examples/HelloWorld/CMakeLists.txt igstk-3.0.0~cvs20080716/Examples/HelloWorld/CMakeLists.txt
---- igstk-3.0.0~cvs20080716~/Examples/HelloWorld/CMakeLists.txt	2006-01-28 20:45:13.000000000 +0100
-+++ igstk-3.0.0~cvs20080716/Examples/HelloWorld/CMakeLists.txt	2008-07-15 18:55:44.000000000 +0200
-@@ -1,4 +1,24 @@
-+cmake_minimum_required(VERSION 2.6)
-+
- PROJECT(HelloWorld)
-+
-+INCLUDE( /usr/lib/IGSTK/IGSTKConfig.cmake )
-+INCLUDE( /usr/lib/IGSTK/UseIGSTK.cmake )
-+
-+FIND_PACKAGE(FLTK)
-+  IF (FLTK_FOUND)
-+    INCLUDE_DIRECTORIES (${FLTK_INCLUDE_DIR})
-+    IF(WIN32)
-+      ADD_DEFINITIONS(-DWIN32)
-+    ENDIF(WIN32)
-+    LINK_LIBRARIES( ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES} )
-+    IF(CYGWIN)
-+      LINK_LIBRARIES( ole32 uuid comctl32 wsock32 supc++ -lm -lgdi32)
-+    ENDIF(CYGWIN)
-+  ELSE (FLTK_FOUND)
-+    MESSAGE( FATAL_ERROR "This application requires FLTK. One of these components is missing. Please verify configuration")
-+  ENDIF (FLTK_FOUND)
-+
-   
- SET(HelloWorld_GUI_SRCS
-     HelloWorldGUI.fl

Copied: trunk/packages/igstk/trunk/debian/patches/90_examples.dpatch (from rev 2893, trunk/packages/igstk/trunk/debian/patches/90_cmake_minimum_required.dpatch)
===================================================================
--- trunk/packages/igstk/trunk/debian/patches/90_examples.dpatch	                        (rev 0)
+++ trunk/packages/igstk/trunk/debian/patches/90_examples.dpatch	2009-01-04 06:06:54 UTC (rev 2895)
@@ -0,0 +1,84 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_cmake_minimum_required.dpatch by  <domibel at sid1500>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Makes the example cmake 2.6 ready, The example can now be built from outside the source directory
+
+ at DPATCH@
+diff -urNad igstk-3.0.0~cvs20081223~/Examples/CMakeLists.txt igstk-3.0.0~cvs20081223/Examples/CMakeLists.txt
+--- igstk-3.0.0~cvs20081223~/Examples/CMakeLists.txt	2009-01-04 01:01:55.000000000 -0500
++++ igstk-3.0.0~cvs20081223/Examples/CMakeLists.txt	2009-01-04 01:03:48.000000000 -0500
+@@ -1,3 +1,58 @@
++cmake_minimum_required(VERSION 2.4)
++
++## INCLUDE( /usr/lib/IGSTK/IGSTKConfig.cmake )
++## INCLUDE( /usr/lib/IGSTK/UseIGSTK.cmake )
++
++#
++# Find IGSTK
++#
++FIND_PACKAGE(IGSTK REQUIRED)
++IF(IGSTK_FOUND)
++  INCLUDE(${IGSTK_USE_FILE})
++ENDIF(IGSTK_FOUND)
++#  MESSAGE( FATAL_ERROR "This application requires IGSTK. One of these components is missing. Please verify configuration")
++#ENDIF (IGSTK_FOUND)
++
++
++#
++# FIND ITK
++#
++FIND_PACKAGE(ITK REQUIRED)
++IF (ITK_FOUND)
++  INCLUDE (${USE_ITK_FILE})
++ELSE (ITK_FOUND)
++  MESSAGE( FATAL_ERROR "This application requires ITK. One of these components is missing. Please verify configuration")
++ENDIF (ITK_FOUND)
++
++
++#
++# FIND VTK
++#
++FIND_PACKAGE(VTK REQUIRED)
++IF (VTK_FOUND)
++  INCLUDE (${USE_VTK_FILE})
++ELSE (VTK_FOUND)
++  MESSAGE( FATAL_ERROR "This application requires VTK. One of these components is missing. Please verify configuration")
++ENDIF (VTK_FOUND)
++
++
++#
++# FIND FLTK
++#
++FIND_PACKAGE(FLTK)
++  IF (FLTK_FOUND)
++    INCLUDE_DIRECTORIES (${FLTK_INCLUDE_DIR})
++    IF(WIN32)
++      ADD_DEFINITIONS(-DWIN32)
++    ENDIF(WIN32)
++    LINK_LIBRARIES( ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES} )
++    IF(CYGWIN)
++      LINK_LIBRARIES( ole32 uuid comctl32 wsock32 supc++ -lm -lgdi32)
++    ENDIF(CYGWIN)
++  ELSE (FLTK_FOUND)
++    MESSAGE( FATAL_ERROR "This application requires FLTK. One of these components is missing. Please verify configuration")
++  ENDIF (FLTK_FOUND)
++
+ #
+ # Examples that do not require GUI
+ #
+@@ -8,12 +63,9 @@
+ #
+ # Examples that require FLTK
+ #
+-IF(IGSTK_USE_FLTK)
+-  SUBDIRS(
++
++SUBDIRS(
+     HelloWorld
+     OneViewAndTracking
+     FourViewsAndTracking
+     )
+-ENDIF(IGSTK_USE_FLTK)
+-
+-


Property changes on: trunk/packages/igstk/trunk/debian/patches/90_examples.dpatch
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mergeinfo
   +