X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPlugins%2FMEDReader%2FCMakeLists.txt;h=36f86d08eeef57a2afc9fb3a6aa64e2f06998c3c;hb=28d538ae59e0716b6b124c0595bf0ef8b3399216;hp=4130a88abf0a9ccb4be852314d8499d0bac81a53;hpb=7cbbd61df3f61d6f3f766b890af5352960bbaa1e;p=modules%2Fparavis.git

diff --git a/src/Plugins/MEDReader/CMakeLists.txt b/src/Plugins/MEDReader/CMakeLists.txt
old mode 100755
new mode 100644
index 4130a88a..36f86d08
--- a/src/Plugins/MEDReader/CMakeLists.txt
+++ b/src/Plugins/MEDReader/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2015  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
@@ -25,10 +25,14 @@
 #setenv LD_LIBRARY_PATH ...MEDReader_INSTALL/lib/salome:${LD_LIBRARY_PATH}
 
 # Typical cmake command
-# env MED_ROOT_DIR=... cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=PATH_TO/MEDReader_INSTALL ../MEDReader_SRC -DMEDFILE_ROOT_DIR=/where/is/med-3.0.7_install
+# cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=PATH_TO/MEDReader_INSTALL ../MEDReader_SRC  \ 
+#       -DMEDFILE_ROOT_DIR=/where/is/med-3.0.7_install -DMEDCOUPLING_ROOT_DIR=/where/is/medcoupling_install \ 
+#       -DParaView_DIR=<PARAVIEW_INSTALL>/lib/cmake/paraview-4.3 
 
+IF(NOT KW_TESTING_PLATFORM)
 PROJECT(MEDReader)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+ENDIF(NOT KW_TESTING_PLATFORM)
 
 IF(COMMAND cmake_policy)
   cmake_policy(SET CMP0003 NEW)
@@ -59,30 +63,29 @@ ELSE(MEDReader_BUILD_ParaView_Plugin)
     ENDIF(NOT VTK_FOUND)
     INCLUDE(${VTK_USE_FILE})
 ENDIF(MEDReader_BUILD_ParaView_Plugin)
- 
+
 # Standard CMake option for building libraries shared or static by default.
 OPTION(BUILD_SHARED_LIBS "Build with shared libraries." ${VTK_BUILD_SHARED_LIBS})
 #
 # Find dependant Library
 #
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "KERNEL_ROOT_DIR")
-SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR} CACHE PATH "MED_ROOT_DIR")
+SET(MEDCOUPLING_ROOT_DIR $ENV{MEDCOUPLING_ROOT_DIR} CACHE PATH "MEDCOUPLING_ROOT_DIR")
 #LIST(APPEND CMAKE_MODULE_PATH "${MED_ROOT_DIR}/adm_local_without_kernel/cmake_files")
 LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
-LIST(APPEND CMAKE_MODULE_PATH "${MED_ROOT_DIR}/adm_local/cmake_files")
+LIST(APPEND CMAKE_MODULE_PATH "${MEDCOUPLING_ROOT_DIR}/cmake_files")
 INCLUDE(SalomeMacros)
 INCLUDE(SalomeSetupPlatform)
-INCLUDE(SalomeMEDConfig)
 FIND_PACKAGE(SalomePython REQUIRED)
 FIND_PACKAGE(SalomeHDF5 REQUIRED)
-FIND_PACKAGE(SalomeMED REQUIRED)
+FIND_PACKAGE(SalomeMEDCoupling REQUIRED)
 FIND_PACKAGE(SalomeMEDFile REQUIRED)
 
 # Accumulate environment variables for PARAVIS module
 SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
                                                  ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON})
-SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
-SALOME_ACCUMULATE_ENVIRONMENT(PV_PLUGIN_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/lib/paraview) 
+SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS})
+SALOME_ACCUMULATE_ENVIRONMENT(PV_PLUGIN_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/lib/paraview)
 
 #
 # process all vtk-modules defined in this plugin. This generates the necessary
@@ -91,7 +94,7 @@ SALOME_ACCUMULATE_ENVIRONMENT(PV_PLUGIN_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/lib
 SET(VTK_INSTALL_RUNTIME_DIR lib/salome)
 SET(VTK_INSTALL_LIBRARY_DIR lib/salome)
 SET(VTK_INSTALL_ARCHIVE_DIR lib/salome)
-INCLUDE_DIRECTORIES(${MEDFILE_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${MEDFILE_INCLUDE_DIRS} ${MEDCOUPLING_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS})
 PV_PROCESS_MODULES()
 
 #
@@ -106,6 +109,7 @@ IF(MEDReader_BUILD_ParaView_Plugin)
   ADD_SUBDIRECTORY(ParaViewPlugin)
 ENDIF(MEDReader_BUILD_ParaView_Plugin)
 
+SET(SALOME_BUILD_TESTS ON CACHE BOOL "Build Salome Test")
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
   ADD_SUBDIRECTORY(Test)