X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPlugins%2FParaMEDCorba%2FCMakeLists.txt;h=7ab3d5d8b19ddbfe46429c2aebb315b1d7369070;hb=e2c075bb656e4e5b0d8e6fcb7e06b5c25f903dee;hp=06cce60cc8ad2de5d87ec97bc9a98f8baafb7f18;hpb=1eb23ff388682331691712a69cd96107c5a4fef6;p=modules%2Fparavis.git diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt index 06cce60c..7ab3d5d8 100644 --- a/src/Plugins/ParaMEDCorba/CMakeLists.txt +++ b/src/Plugins/ParaMEDCorba/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2010-2012 CEA/DEN, EDF R&D +# Copyright (C) 2010-2013 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 @@ -19,7 +19,7 @@ PROJECT( ParaMEDCorba ) - CMAKE_MINIMUM_REQUIRED( VERSION 2.6 ) + CMAKE_MINIMUM_REQUIRED( VERSION 2.8.7 ) ## !!! 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" ) @@ -28,12 +28,15 @@ PROJECT( ParaMEDCorba ) EXECUTABLE_OUTPUT_PATH ) - FIND_PACKAGE( ParaView REQUIRED ) + FIND_PACKAGE( ParaView COMPONENTS pqCore NO_MODULE) IF( ParaView_FOUND ) INCLUDE( ${PARAVIEW_USE_FILE} ) + FIND_PACKAGE( VTK 6.0 COMPONENTS vtkClientServer NO_MODULE) + INCLUDE( ${VTK_USE_FILE} ) + SET( PARACORBAPLUG_SRCS ${ParaMEDCorba_SOURCE_DIR}/vtkParaMEDCorbaSource.cxx ) @@ -52,14 +55,14 @@ PROJECT( ParaMEDCorba ) SET_TARGET_PROPERTIES(ParaMEDCorbaPlugin PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}") TARGET_LINK_LIBRARIES(ParaMEDMEM2VTK - vtkCommon - vtkFiltering - vtkGraphics + #vtkCommon + #vtkFiltering + #vtkGraphics vtkClientServer pqCore ${OMNIORB_LIBRARIES} - ${SalomeIDLMED} - ${SalomeIDLKernel} + ${MED_SalomeIDLMED} + ${KERNEL_SalomeIDLKernel} ${QT_LIBS} ) TARGET_LINK_LIBRARIES(ParaMEDCorbaPlugin