Merge branch 'abn/port_pv42' into abn/rearch

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

diff --git a/src/Plugins/MEDReader/CMakeLists.txt b/src/Plugins/MEDReader/CMakeLists.txt
index 702a093759882c28e2be95031f811ee360d18cdc..4130a88abf0a9ccb4be852314d8499d0bac81a53 100644 (file)
--- a/src/Plugins/MEDReader/CMakeLists.txt
+++ b/src/Plugins/MEDReader/CMakeLists.txt
@@ -3,7 +3,7 @@
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,7 +28,6 @@
 # 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
 
 PROJECT(MEDReader)
-ENABLE_TESTING()
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 IF(COMMAND cmake_policy)
@@ -76,8 +75,15 @@ INCLUDE(SalomeSetupPlatform)
 INCLUDE(SalomeMEDConfig)
 FIND_PACKAGE(SalomePython REQUIRED)
 FIND_PACKAGE(SalomeHDF5 REQUIRED)
+FIND_PACKAGE(SalomeMED 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) 
+
 #
 # process all vtk-modules defined in this plugin. This generates the necessary
 # wrappings for all these modules as well.
@@ -100,4 +106,7 @@ IF(MEDReader_BUILD_ParaView_Plugin)
   ADD_SUBDIRECTORY(ParaViewPlugin)
 ENDIF(MEDReader_BUILD_ParaView_Plugin)
 
-ADD_SUBDIRECTORY(Test)
+IF(SALOME_BUILD_TESTS)
+  ENABLE_TESTING()
+  ADD_SUBDIRECTORY(Test)
+ENDIF()