[Insight-developers] Wrap ITK patch

[Karthik Krishnan]

Gaetan:

Thanks for the WrapITK stuff,

Please review and apply the attached patch:

With wrapping, we used to have the option that if CableSwig was checked 
out into  "Insight/Utilities/CableSwig" things would build just fine.  
ie CableSwig would be built and all the wrapping would use the that 
build of cableswig . There would be no need to have CableSwig built 
separately on your machine. This is done on some of the dashboard 
machines. (After all Brad wrote CableSwig as a part of ITK)

----

Also, why do I get a cache variable for IMAGE_COMPARE when I build ITK 
and where do I get this executable from ?  The code, I can see is in 
Code/IO and the executable should can be specified internally. Is this 
to handle paths for multi-configuration build systems like 
Windows/XCode, which determine the executable path at build time ? There 
is a workaround for that. Let me know.

---------
-karthik



Gaetan Lehmann wrote:

>
> What is the status on windows plateform ? I don't find a windows build 
> on  the dashboard, but I have surely missed it.
> If it (mostly) work on windows, then I can't see any important change 
> to  do :-)
>
> Gaetan
>
>
> On Fri, 08 Sep 2006 16:01:10 +0200, Luis Ibanez 
> <luis.ibanez at kitware.com>  wrote:
>
>>
>> Hi Gaetan,
>>
>> Do you see the need for any major changes
>> related to the integration of WrapITK ?
>>
>> Could we consider to tag the CVS repository
>> with the "post" integration tag ?
>>
>>
>> Please let us know,
>>
>>
>>
>>     Thanks
>>
>>
>>       Luis
>>
>>
>
>
>
-------------- next part --------------
? .CMakeLists.txt.swp
? WrappingPatch.patch
? Wrapping/.CMakeLists.txt.swp
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/Insight/Insight/CMakeLists.txt,v
retrieving revision 1.240
diff -u -r1.240 CMakeLists.txt
--- CMakeLists.txt	7 Sep 2006 08:24:33 -0000	1.240
+++ CMakeLists.txt	8 Sep 2006 17:24:04 -0000
@@ -121,6 +121,8 @@
      )
 ENDIF(NOT ITK_NO_LIBRARY_VERSION)
 
+OPTION(USE_WRAP_ITK "Build external languages support" OFF)
+
 OPTION(ITK_CSWIG_TCL "Build cswig Tcl wrapper support (requires CableSwig)." OFF)
 OPTION(ITK_CSWIG_PYTHON "Build cswig Python wrapper support (requires CableSwig)." OFF)
 OPTION(ITK_CSWIG_JAVA "Build cswig Java wrapper support " OFF)
@@ -130,9 +132,6 @@
 # not there yet.
 #OPTION(ITK_CSWIG_PERL "Build cswig Perl wrapper support " OFF)
 
-# Include Wrapping sub directory
-SUBDIRS(Wrapping)
-
 #-----------------------------------------------------------------------------
 # ITK build patented algorithms
 OPTION(ITK_USE_PATENTED "Build algorithms that are covered with Patents. It is YOUR responsibility to obtain a license from the patent holder in order to use these methods." OFF)
@@ -237,6 +236,10 @@
 # Do we need CableSwig?
 SET(ITK_NEED_CableSwig 0)
 
+IF(USE_WRAP_ITK)
+  SET(ITK_NEED_CableSwig 1)
+ENDIF(USE_WRAP_ITK)
+
 IF(ITK_CSWIG_TCL)
   SET(ITK_NEED_CableSwig 1)
 ENDIF(ITK_CSWIG_TCL)
@@ -387,6 +390,9 @@
   SUBDIRS(Wrapping/CSwig)
 ENDIF(ITK_CSWIG_DIR)
 
+# Include Wrapping sub directory
+SUBDIRS(Wrapping)
+
 IF (BUILD_TESTING)
   SUBDIRS(Testing)
 ENDIF (BUILD_TESTING)
Index: Wrapping/CMakeLists.txt
===================================================================
RCS file: /cvsroot/Insight/Insight/Wrapping/CMakeLists.txt,v
retrieving revision 1.12
diff -u -r1.12 CMakeLists.txt
--- Wrapping/CMakeLists.txt	6 Sep 2006 20:58:41 -0000	1.12
+++ Wrapping/CMakeLists.txt	8 Sep 2006 17:24:05 -0000
@@ -1,4 +1,3 @@
-OPTION(USE_WRAP_ITK "Build external languages support" OFF)
 IF(USE_WRAP_ITK)
   SUBDIRS(WrapITK)
 ENDIF(USE_WRAP_ITK)