[med-svn] r3526 - in trunk/packages/gdcm/tags/2.0.10-5/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2009-06-22 18:25:50 +0000 (Mon, 22 Jun 2009)
New Revision: 3526

Modified:
   trunk/packages/gdcm/tags/2.0.10-5/debian/patches/mono.patch
   trunk/packages/gdcm/tags/2.0.10-5/debian/rules
Log:
minor tweaks

Modified: trunk/packages/gdcm/tags/2.0.10-5/debian/patches/mono.patch
===================================================================
--- trunk/packages/gdcm/tags/2.0.10-5/debian/patches/mono.patch	2009-06-22 17:03:28 UTC (rev 3525)
+++ trunk/packages/gdcm/tags/2.0.10-5/debian/patches/mono.patch	2009-06-22 18:25:50 UTC (rev 3526)
@@ -1,12 +1,24 @@
 --- gdcm-2.0.10.orig/CMake/FindMONO.cmake	(revision 5851)
 +++ gdcm-2.0.10/CMake/FindMONO.cmake	(working copy)
-@@ -42,6 +42,9 @@
+@@ -42,6 +42,10 @@
  # TODO get version
  # TODO: there are multiple 'mcs' command on unix, need to check this is Mono:
  # mcs --version should return "Mono C# compiler version 1.9.1.0"
 +ELSEIF(MONO_EXECUTABLE AND GMCS_EXECUTABLE)
-+SET(MCS_EXECUTABLE ${GMCS_EXECUTABLE})
 +SET(MONO_FOUND TRUE)
++ELSEIF(MONO_EXECUTABLE AND SMCS_EXECUTABLE)
++SET(MONO_FOUND TRUE)
  ENDIF(MONO_EXECUTABLE AND MCS_EXECUTABLE)
  
  IF(NOT MONO_FOUND)
+--- gdcm-2.0.10.orig/CMake/UseCSharp.cmake	(revision 5851)
++++ gdcm-2.0.10/CMake/UseCSharp.cmake	(working copy)
+@@ -52,6 +52,8 @@
+ IF(NOT CMAKE_CSHARP_COMPILER)
+   # status message only for now:
+   MESSAGE("Sorry C# v${DESIRED_CSHARP_COMPILER_VERSION} was not found on your system")
++ELSE(NOT CMAKE_CSHARP_COMPILER)
++  MESSAGE("Will be using C# v${DESIRED_CSHARP_COMPILER_VERSION}: ${CMAKE_CSHARP_COMPILER}")
+ ENDIF(NOT CMAKE_CSHARP_COMPILER)
+ 
+ MACRO(CSHARP_ADD_LIBRARY name)

Modified: trunk/packages/gdcm/tags/2.0.10-5/debian/rules
===================================================================
--- trunk/packages/gdcm/tags/2.0.10-5/debian/rules	2009-06-22 17:03:28 UTC (rev 3525)
+++ trunk/packages/gdcm/tags/2.0.10-5/debian/rules	2009-06-22 18:25:50 UTC (rev 3526)
@@ -74,6 +74,7 @@
 		-DGDCM_BUILD_TESTING:BOOL=OFF \
 		-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \
+		-DDESIRED_CSHARP_COMPILER_VERSION=2 \
 		-DGDCM_USE_SYSTEM_UUID:BOOL=ON \
 		-DGDCM_USE_SYSTEM_ZLIB:BOOL=ON \
 		-DGDCM_USE_SYSTEM_OPENJPEG:BOOL=ON \