From: Cédric Aguerre <cedric.aguerre@edf.fr>
Date: Fri, 6 Nov 2015 14:08:58 +0000 (+0100)
Subject: Merge branch 'master' of https://git.salome-platform.org/git/modules/paravis
X-Git-Tag: simple_cmake~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2c2ab458c2cd6cb98f295ad73eef62decbff42fe;p=modules%2Fparavis.git

Merge branch 'master' of https://git.salome-platform.org/git/modules/paravis
---

2c2ab458c2cd6cb98f295ad73eef62decbff42fe
diff --cc CMakeLists.txt
index 6409504b,2663ac02..ea961ae9
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -209,18 -197,21 +203,24 @@@ IF(SALOME_PARAVIS_BUILD_PLUGINS AND SAL
      LIST(APPEND CMAKE_MODULE_PATH "${SMESH_ROOT_DIR}/adm_local/cmake_files")
      FIND_PACKAGE(SalomeSMESH REQUIRED)
    ELSE()
 -    MESSAGE(FATAL_ERROR "We absolutely need a Salome MESH to import MESH objects to PARAVIS, please define SMESH_ROOT_DIR
 -                         or set SALOME_PARAVIS_USE_SMESH_SOURCE=OFF")
 +    MESSAGE(WARNING "Salome MESH is absolutely needed to import MESH objects to PARAVIS.
 +                    As we do not find it, we set the variable SALOME_PARAVIS_USE_SMESH_SOURCE=OFF.
 +                    If you really need Salome MESH, please define SMESH_ROOT_DIR and re-run configuration script.")
 +    SET(SALOME_PARAVIS_USE_SMESH_SOURCE OFF)
    ENDIF()
  ELSEIF(NOT SALOME_PARAVIS_BUILD_PLUGINS AND SALOME_PARAVIS_USE_SMESH_SOURCE)
 -  MESSAGE(FATAL_ERROR "We absolutely need to build PARAVIS plugins to use the import of MESH objects to PARAVIS,
 -                       please set SALOME_PARAVIS_BUILD_PLUGINS=ON
 -                       or SALOME_PARAVIS_USE_SMESH_SOURCE=OFF")
 +  MESSAGE(WARNING "PARAVIS plugins must be built to use the import of MESH objects to PARAVIS.
 +                  As plugins are not built, we set the variable SALOME_PARAVIS_USE_SMESH_SOURCE=OFF.
 +                  If you really want to use Salome MESH, please set SALOME_PARAVIS_BUILD_PLUGINS=ON and re-run configuration script.")
 +  SET(SALOME_PARAVIS_USE_SMESH_SOURCE OFF)
  ENDIF()
  
+ IF(SALOME_BUILD_TESTS)
+   ENABLE_TESTING()
+   FIND_PACKAGE(SalomeCppUnit)
+   SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
+ ENDIF()
+ 
  ## Detection summary:
  SALOME_PACKAGE_REPORT_AND_CHECK()