[Paraview] [Xdmf] proposed fix of CMakeLists.txt

[Dominik Szczerba]

Hi Robert,

This is the difference between what you posted and what I want to
correct to have:

--- pv	2011-06-09 21:31:37.343077978 +0200
+++ test	2011-06-09 21:32:48.371205812 +0200
@@ -1,7 +1,7 @@
 IF(VTK_WRAP_PYTHON)
     INCLUDE(${VTK_CMAKE_DIR}/vtkWrapPython.cmake OPTIONAL)
     VTK_WRAP_PYTHON2(vtk${PROJECT_NAME}Python XdmfPython_SRCS ${Xdmf_SRCS})
-    VTK_ADD_LIBRARY(vtk${PROJECT_NAME}Python MODULE
${XdmfPython_SRCS} ${Xdmf_SRCS})
+    ADD_LIBRARY(vtk${PROJECT_NAME}Python MODULE ${XdmfPython_SRCS}
${Xdmf_SRCS})
     IF(VTK_USE_PARALLEL)
       TARGET_LINK_LIBRARIES(vtk${PROJECT_NAME}Python vtkIOPythonD
vtkRenderingPythonD vtkParallelPythonD Xdmf)
     ELSE(VTK_USE_PARALLEL)


In summary, what is currently in the master branch:

1 if parallel vtk then
2 link with vtk parallel lib
3 else
4 do not link with vtk parallel lib
5 link with vtk parallel lib

My patch simply removes line 5.

PS. I am still worried not having a clear image which Xdmf source I
should use. On the wiki page I count 2, the 3rd one is the original
one, now you tell me about PV branch. Why is this all needed?

Regards,
Dominik

On Thu, Jun 9, 2011 at 5:29 PM, Robert Maynard
<robert.maynard at kitware.com> wrote:
> Hi Dominik,
> This patch request confuses me since currently we are not explicitly link to
> python unless it is enabled. The code currently in the pv branch of XDMF is:
>   IF(VTK_WRAP_PYTHON)
>     INCLUDE(${VTK_CMAKE_DIR}/vtkWrapPython.cmake OPTIONAL)
>     VTK_WRAP_PYTHON2(vtk${PROJECT_NAME}Python XdmfPython_SRCS ${Xdmf_SRCS})
>     VTK_ADD_LIBRARY(vtk${PROJECT_NAME}Python MODULE ${XdmfPython_SRCS}
> ${Xdmf_SRCS})
>     IF(VTK_USE_PARALLEL)
>       TARGET_LINK_LIBRARIES(vtk${PROJECT_NAME}Python vtkIOPythonD
> vtkRenderingPythonD vtkParallelPythonD Xdmf)
>     ELSE(VTK_USE_PARALLEL)
>       TARGET_LINK_LIBRARIES(vtk${PROJECT_NAME}Python vtkIOPythonD
> vtkRenderingPythonD Xdmf)
>     ENDIF(VTK_USE_PARALLEL)
>     ADD_DEPENDENCIES(vtk${PROJECT_NAME}Python vtk${PROJECT_NAME})
>   ENDIF(VTK_WRAP_PYTHON)
> On Thu, Jun 9, 2011 at 11:10 AM, Dominik Szczerba <dominik at itis.ethz.ch>
> wrote:
>>
>> Dear all,
>>
>> I have just checked, the previously fix has not been integrated. Is
>> there a reason? Currently there is a nice conditional, but afterwards
>> vtkParallelPythonD is unconditionally linked anyway ;))
>> Here again a patch against the latest git from
>> git://paraview.org/Xdmf.git.
>> Can you please commit it or let me do it?
>>
>> Many thanks.
>>
>> --- CMakeLists.txt.orig.txt     2011-06-09 17:05:56.125816000 +0200
>> +++ CMakeLists.txt      2011-06-09 17:00:59.844367200 +0200
>> @@ -141,8 +141,6 @@
>>     ELSE(VTK_USE_PARALLEL)
>>       TARGET_LINK_LIBRARIES(vtk${PROJECT_NAME}Python vtkIOPythonD
>> vtkRenderingPythonD Xdmf)
>>     ENDIF(VTK_USE_PARALLEL)
>> -    TARGET_LINK_LIBRARIES(vtk${PROJECT_NAME}Python vtkIOPythonD
>> -      vtkRenderingPythonD vtkParallelPythonD Xdmf)
>>     ADD_DEPENDENCIES(vtk${PROJECT_NAME}Python vtk${PROJECT_NAME})
>>   ENDIF(VTK_WRAP_PYTHON)
>>  ELSE(VTK_FOUND)
>>
>>
>> On Wed, Feb 23, 2011 at 11:08 PM, Dominik Szczerba <dominik at itis.ethz.ch>
>> wrote:
>> > Hi Robert,
>> >
>> > I just pulled the latest version to find an error again. I do not know
>> > what went wrong, but here is a fix against the latest git version.
>> >
>> > Regards,
>> > Dominik
>> >
>> > --- vtk/CMakeLists.txt.orig     2011-02-23 22:57:13.000000000 +0100
>> > +++ vtk/CMakeLists.txt  2011-02-23 23:05:00.000000000 +0100
>> > @@ -141,8 +141,6 @@
>> >     ELSE(VTK_USE_PARALLEL)
>> >       TARGET_LINK_LIBRARIES(vtk${PROJECT_NAME}Python vtkIOPythonD
>> > vtkRenderingPythonD Xdmf)
>> >     ENDIF(VTK_USE_PARALLEL)
>> > -    TARGET_LINK_LIBRARIES(vtk${PROJECT_NAME}Python vtkIOPythonD
>> > -      vtkRenderingPythonD vtkParallelPythonD Xdmf)
>> >     ADD_DEPENDENCIES(vtk${PROJECT_NAME}Python vtk${PROJECT_NAME})
>> >   ENDIF(VTK_WRAP_PYTHON)
>> >  ELSE(VTK_FOUND)
>> >
>> >
>> > On Fri, Jan 28, 2011 at 10:19 PM, Robert Maynard
>> > <robert.maynard at kitware.com> wrote:
>> >> Hi Dominik,
>> >> Thanks for the updated patch, I just wanted to give you a heads up
>> >> about the
>> >> patch because I almost ignored your email since it was inverted.
>> >> I committed your fix, and gave your authorship as you can see following
>> >> the
>> >> link.
>> >>
>> >> http://paraview.org/gitweb?p=Xdmf.git;a=commit;h=a3abadc1cd95b8b9ec4e96a4b94f496f2b937fb1
>> >>
>> >> On Fri, Jan 28, 2011 at 4:09 PM, Dominik Szczerba
>> >> <dominik at itis.ethz.ch>
>> >> wrote:
>> >>>
>> >>> Hi Robert,
>> >>> Yes indeed, I am very sorry...
>> >>> Corrected one attached. I also generated the patch now from the root
>> >>> folder to make explicitly clear I want to modify vtk/CMakeLists.txt
>> >>> and not the base one.
>> >>> Regards,
>> >>> Dominik
>> >>>
>> >>> On Fri, Jan 28, 2011 at 9:25 PM, Robert Maynard
>> >>> <robert.maynard at kitware.com> wrote:
>> >>> > Hi Dominik,
>> >>> > I will add this today to the pv branch of XDMF. In the future can
>> >>> > you
>> >>> > diff
>> >>> > the other way, currently it looks like your patch removes non
>> >>> > parallel
>> >>> > compilation.
>> >>> >
>> >>> > On Fri, Jan 28, 2011 at 10:21 AM, Dominik Szczerba
>> >>> > <dominik at itis.ethz.ch>
>> >>> > wrote:
>> >>> >>
>> >>> >> Please find attached a simple patch fixing compilation with no
>> >>> >> parallel support. I would be happy if you could commit it to the
>> >>> >> repository.
>> >>> >> Thanks and best regards,
>> >>> >> Dominik
>> >>> >>
>> >>> >> _______________________________________________
>> >>> >> Xdmf mailing list
>> >>> >> Xdmf at lists.kitware.com
>> >>> >> http://www.kitware.com/cgi-bin/mailman/listinfo/xdmf
>> >>> >>
>> >>> >
>> >>> >
>> >>> >
>> >>> > --
>> >>> > Robert Maynard
>> >>> >
>> >>
>> >>
>> >>
>> >> --
>> >> Robert Maynard
>> >>
>> >
>
>
>
> --
> Robert Maynard
>