MAJ vers paraview 5.4

[modules/paravis.git] / src / Plugins / ParaMEDCorba / CMakeLists.txt

diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt
index b58baba56a71ad8a3665de8a4d7eb8c63c446943..96880ae4a379a382e179d85757760d86907fa4d0 100644 (file)
--- a/src/Plugins/ParaMEDCorba/CMakeLists.txt
+++ b/src/Plugins/ParaMEDCorba/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,10 @@
 PROJECT( ParaMEDCorba )
 
   CMAKE_MINIMUM_REQUIRED( VERSION 2.8.7 )
+  IF(WIN32)
+    CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib 
+  ENDIF(WIN32)
+
   ## !!! This definition corrupts wrapping process
   #SET( LIBRARY_OUTPUT_PATH ${ParaMEDCorba_BINARY_DIR}/bin CACHE INTERNAL "Single place for output" )
   #SET( EXECUTABLE_OUTPUT_PATH ${ParaMEDCorba_BINARY_DIR}/bin  CACHE INTERNAL "Single place for output" )
@@ -33,8 +37,8 @@ PROJECT( ParaMEDCorba )
   IF( ParaView_FOUND )
     
     INCLUDE( ${PARAVIEW_USE_FILE} )
-
-    FIND_PACKAGE( VTK 6.1 COMPONENTS vtkClientServer NO_MODULE)
+    
+    FIND_PACKAGE( VTK COMPONENTS vtkClientServer NO_MODULE NO_DEFAULT_PATH)
     INCLUDE( ${VTK_USE_FILE} )
 
     SET( PARACORBAPLUG_SRCS
@@ -46,8 +50,6 @@ PROJECT( ParaMEDCorba )
     
     ADD_PARAVIEW_PLUGIN( ParaMEDCorbaPlugin "1.0"
       SERVER_MANAGER_XML ParaMEDCorbaServerManager.xml
-      GUI_RESOURCE_FILES
-      ParaMEDCorbaUserInterfaceSources.xml
       SERVER_MANAGER_SOURCES ${PARACORBAPLUG_SRCS} )
     
     INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${MED_ROOT_DIR}/include/salome ${KERNEL_ROOT_DIR}/include/salome)
@@ -58,6 +60,7 @@ PROJECT( ParaMEDCorba )
       #vtkFiltering
       #vtkGraphics
       vtkClientServer
+      vtkPVVTKExtensionsRendering
       pqCore
       ${OMNIORB_LIBRARIES}
       ${MED_SalomeIDLMED}