Addition of SCOTCH in MEDPartitioner.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 115ca42855253de286f08eef90b8b107bb006273..808126afb12c343723d64f879a87307fc4094e1a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,10 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-# TODO: write those in the new format, and load them via FIND_PACKAGE():
-#INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindPARMETIS.cmake)
-#INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindMETIS.cmake)
-#INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindSCOTCH.cmake)
 #IF(WIN32)
 #  INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindXDR.cmake)
 #ENDIF(WIN32)
@@ -91,6 +87,9 @@ IF(NOT SALOME_MED_MICROMED)
     IF(SALOME_MED_PARTITIONER_METIS)
       FIND_PACKAGE(SalomeMetis REQUIRED)
     ENDIF(SALOME_MED_PARTITIONER_METIS)
+    IF(SALOME_MED_PARTITIONER_SCOTCH)
+      FIND_PACKAGE(SalomeScotch REQUIRED)
+    ENDIF(SALOME_MED_PARTITIONER_SCOTCH)
   ENDIF(SALOME_MED_ENABLE_PARTITIONER)
 ENDIF(NOT SALOME_MED_MICROMED)
 

diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
index b0b83f94afb4d0c9e72dcf9e13ac60ad797be243..9b0f47f198cefe78451ab87f99bb285a4e2b4056 100644 (file)
--- a/adm_local/cmake_files/CMakeLists.txt
+++ b/adm_local/cmake_files/CMakeLists.txt
@@ -20,10 +20,12 @@
 SET(admlocal_cmake_DATA
   FindMED.cmake
   FindXDR.cmake
-  FindMETIS.cmake
+  FindMetis.cmake
+  FindSalomeMetis.cmake
   FindPARMETIS.cmake
   FindRENUMBER.cmake
-  FindSCOTCH.cmake
+  FindScotch.cmake
+  FindSalomeScotch.cmake
   FindSPLITTER.cmake
   )