X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=ef83a56c739409b7188b05c98c6b1fbbb496af08;hb=c4551c56aa89896595842e5b41b048044681b4e8;hp=6de2652ff3f98749f75c4efbc3b6df664a987ea9;hpb=ebb767b662ff4e778f5e8657979e5f85adad66b9;p=tools%2Fmedcoupling.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6de2652ff..ef83a56c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11 FATAL_ERROR)
 #INCLUDE(CMakeDependentOption)
 PROJECT(MEDCoupling C CXX)
 
@@ -30,14 +30,19 @@ 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 4)
 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})
 
-# Our own set of macros:
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_files")
-INCLUDE(SalomeMacros)
+# Common CMake macros
+SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake 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()
 
 # Platform setup
 # ==============
@@ -47,7 +52,7 @@ INCLUDE(SalomeSetupPlatform)
 # User options
 # ============
 INCLUDE(CMakeDependentOption)
-OPTION(MEDCOUPLING_MICROMED "Build MED without MED file dependancy." OFF)
+OPTION(MEDCOUPLING_MICROMED "Build MED without MED file dependency." OFF)
 OPTION(MEDCOUPLING_ENABLE_PYTHON "Build PYTHON bindings." ON)
 OPTION(MEDCOUPLING_ENABLE_PARTITIONER "Build MEDPartitioner." ON)
 OPTION(MEDCOUPLING_ENABLE_RENUMBER "Build Renumber." ON)
@@ -64,9 +69,11 @@ ENDIF()
 CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner."  ${USE_METIS_NOT_PARMETIS}
         "MEDCOUPLING_ENABLE_PARTITIONER" OFF)
 CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON 
-        "MEDCOUPLING_ENABLE_PARTITIONER;NOT MEDCOUPLING_USE_MPI" OFF)
+        "MEDCOUPLING_ENABLE_PARTITIONER" OFF)
 CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ${MEDCOUPLING_USE_MPI} 
         "MEDCOUPLING_ENABLE_PARTITIONER;MEDCOUPLING_USE_MPI" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_PTSCOTCH "Enable ptscotch graph library in MEDPartitioner." ${MEDCOUPLING_USE_MPI} 
+        "MEDCOUPLING_ENABLE_PARTITIONER;MEDCOUPLING_USE_MPI" OFF)
 SET(XDR_DEFAULT_OPTION ON)
 IF(WIN32)
     SET(XDR_DEFAULT_OPTION OFF)
@@ -84,6 +91,10 @@ IF(${MEDCOUPLING_PARTITIONER_PARMETIS} AND ${MEDCOUPLING_PARTITIONER_METIS})
     MESSAGE(FATAL_ERROR "ParMetis and Metis are mutually exclusive! Make a choice (options MEDCOUPLING_PARTITIONER_METIS and MEDCOUPLING_PARTITIONER_PARMETIS).")
 ENDIF()
 
+IF(${MEDCOUPLING_PARTITIONER_PTSCOTCH} AND ${MEDCOUPLING_PARTITIONER_SCOTCH})
+    MESSAGE(FATAL_ERROR "PTScotch and Scotch are mutually exclusive! Make a choice (options MEDCOUPLING_PARTITIONER_SCOTCH and MEDCOUPLING_PARTITIONER_PTSCOTCH).")
+ENDIF()
+
 #
 # Set list of prerequisites
 # =========================
@@ -133,6 +144,13 @@ IF(MEDCOUPLING_USE_MPI)
       ADD_DEFINITIONS("-DMED_ENABLE_PARMETIS")
     ENDIF()
   ENDIF(MEDCOUPLING_PARTITIONER_PARMETIS)
+  IF(MEDCOUPLING_PARTITIONER_PTSCOTCH)
+    FIND_PACKAGE(SalomePTScotch)
+    SALOME_LOG_OPTIONAL_PACKAGE(PTScotch MEDCOUPLING_PARTITIONER_PTSCOTCH)
+    IF(SalomePTScotch_FOUND)
+      ADD_DEFINITIONS("-DMED_ENABLE_PTSCOTCH")
+    ENDIF(SalomePTScotch_FOUND)
+  ENDIF(MEDCOUPLING_PARTITIONER_PTSCOTCH)
 ENDIF(MEDCOUPLING_USE_MPI)
 
 IF(MEDCOUPLING_ENABLE_RENUMBER)
@@ -148,6 +166,14 @@ IF(MEDCOUPLING_ENABLE_PYTHON)
   SALOME_LOG_OPTIONAL_PACKAGE(PythonInterp MEDCOUPLING_ENABLE_PYTHON)
   SALOME_LOG_OPTIONAL_PACKAGE(PythonLibs MEDCOUPLING_ENABLE_PYTHON)
   SALOME_LOG_OPTIONAL_PACKAGE(SWIG   MEDCOUPLING_ENABLE_PYTHON)
+  IF ("${PYTHON_VERSION_MAJOR}" STREQUAL "2")
+    IF("${PYTHON_VERSION_MINOR}" LESS "7")
+      MESSAGE(FATAL_ERROR "MEDCoupling's Python requires at least Python 2.7 (you seem to have ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}). Upgrade your Python, or turn off MEDCOUPLING_ENABLE_PYTHON")
+    ENDIF()
+  ENDIF()
+  IF ("${PYTHON_VERSION_MAJOR}" STREQUAL "3")
+      MESSAGE(STATUS "Using Python 3")
+  ENDIF()
 ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
 IF(MEDCOUPLING_BUILD_DOC)
@@ -214,14 +240,16 @@ IF(WIN32)
 ENDIF(WIN32)
 
 ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(cmake_files)
+ADD_SUBDIRECTORY(adm_local)
 
 IF(MEDCOUPLING_BUILD_DOC)
   ADD_SUBDIRECTORY(doc)
 ENDIF(MEDCOUPLING_BUILD_DOC)
 
 ADD_SUBDIRECTORY(resources)
-ADD_SUBDIRECTORY(v8_work)
+IF(MEDCOUPLING_ENABLE_PYTHON)
+  ADD_SUBDIRECTORY(v8_work)
+ENDIF()
 
 # Configuration export
 # ====================
@@ -230,7 +258,7 @@ INCLUDE(CMakePackageConfigHelpers)
 # List of targets in this project we want to make visible to the rest of the world.
 # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup"
 SET(_${PROJECT_NAME}_exposed_targets
-   interpkernel medcoupling medcouplingremapper)
+   interpkernel medcouplingcpp medcouplingremapper)
 
 IF(NOT MEDCOUPLING_MICROMED)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets medloader)