[salome test] Add REQUIRE_X_SERVER label on MEDReader and PARAVIS tests

[modules/paravis.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1125184f9d9b77f1944f8725718348a524d2fa22..c948ec984515a0dd1cbb5c3a0d2047f8d7bbc160 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,9 @@ ENDIF(WIN32)
 
 # Ensure a proper linker behavior:
 CMAKE_POLICY(SET CMP0003 NEW)
+IF(WIN32)
+  CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib 
+ENDIF(WIN32)
 
 # Versioning
 # ===========
@@ -34,18 +37,27 @@ CMAKE_POLICY(SET CMP0003 NEW)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 1)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
+
+# Common CMake macros
+# ===================
+SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
+IF(EXISTS ${CONFIGURATION_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
+  INCLUDE(SalomeMacros)
+ELSE()
+  MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+ENDIF()
 
 # Find KERNEL
 # ===========
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
 IF(EXISTS ${KERNEL_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
-  INCLUDE(SalomeMacros)
   FIND_PACKAGE(SalomeKERNEL REQUIRED)
   ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
   INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS})
@@ -58,8 +70,6 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR})
 INCLUDE(SalomeSetupPlatform)   # From KERNEL
 # Always build libraries as shared objects:
 SET(BUILD_SHARED_LIBS TRUE)
-# Local macros:
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
 
 # User options
 # ============
@@ -82,8 +92,8 @@ CMAKE_DEPENDENT_OPTION(SALOME_LIGHT_ONLY "Build SALOME Light only (no CORBA)" OF
 ##
 ## From KERNEL:
 ##
-
-FIND_PACKAGE(SalomePython REQUIRED)
+FIND_PACKAGE(SalomePythonInterp REQUIRED)
+FIND_PACKAGE(SalomePythonLibs REQUIRED)
 
 IF(NOT SALOME_LIGHT_ONLY)
   FIND_PACKAGE(SalomeOmniORB REQUIRED)
@@ -131,23 +141,12 @@ ENDIF()
 
 FIND_PACKAGE(SalomeParaView REQUIRED)
 
-FIND_PACKAGE(ParaView COMPONENTS vtkPVCatalyst vtkPVPythonCatalyst)
-LIST(FIND VTK_MODULES_ENABLED vtkPVCatalyst vtkPVCatalyst_index)
-LIST(FIND VTK_MODULES_ENABLED vtkPVPythonCatalyst vtkPVPythonCatalyst_index)
-IF (${vtkPVCatalyst_index} GREATER -1 AND
-    ${vtkPVPythonCatalyst_index} GREATER -1)
-  SET(PVCATALYST_ENABLED yes)
-ENDIF()
-IF (PVCATALYST_ENABLED)
-  ADD_DEFINITIONS("-DPVCATALYST_ENABLED")
-ENDIF()
-
 ##
 ## From MEDCoupling / MEDFile / or MEDModule (if CORBA plugin required):
 ##
 
 IF(SALOME_PARAVIS_BUILD_PLUGINS)
-   # If CORBA plugins required, take in MED module
+   # If CORBA plugins required, take in MED module 
    IF(SALOME_PARAVIS_BUILD_CORBA_PLUGINS)
       SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR} CACHE PATH "Path to the SALOME MED module")
       IF(EXISTS ${MED_ROOT_DIR})
@@ -158,11 +157,11 @@ IF(SALOME_PARAVIS_BUILD_PLUGINS)
     ELSE(SALOME_PARAVIS_BUILD_CORBA_PLUGINS)
        SET(MEDCOUPLING_ROOT_DIR $ENV{MEDCOUPLING_ROOT_DIR} CACHE PATH "Path to the MEDCoupling tool")
        IF(EXISTS ${MEDCOUPLING_ROOT_DIR})
-          LIST(APPEND CMAKE_MODULE_PATH "${MEDCOUPLING_ROOT_DIR}/cmake_files")
+          LIST(APPEND CMAKE_MODULE_PATH "${MEDCOUPLING_ROOT_DIR}/cmake_files")   
        ENDIF()
        FIND_PACKAGE(SalomeMEDCoupling)            # will load MEDFile
        SALOME_LOG_OPTIONAL_PACKAGE(MEDCoupling SALOME_PARAVIS_BUILD_PLUGINS)
-    ENDIF()
+    ENDIF()        
 ENDIF(SALOME_PARAVIS_BUILD_PLUGINS)
 
 ##
@@ -274,7 +273,6 @@ SALOME_ACCUMULATE_ENVIRONMENT(PV_PLUGIN_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/lib
 # Sources
 # ========
 ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(adm_local)
 ADD_SUBDIRECTORY(resources)
 
 IF(SALOME_BUILD_DOC)