Addition of SCOTCH in MEDPartitioner.

diff --git a/adm_local/cmake_files/FindScotch.cmake b/adm_local/cmake_files/FindScotch.cmake
index b5c8f6b9d15177cb5fb91fb6e7b644640f2681f2..e1657416f4a89ee2ad055c231d17f1302b93f167 100644 (file)
--- a/adm_local/cmake_files/FindScotch.cmake
+++ b/adm_local/cmake_files/FindScotch.cmake
@@ -27,6 +27,8 @@ IF(SCOTCH_ROOT_DIR)
 ENDIF(SCOTCH_ROOT_DIR)
 
 FIND_LIBRARY(SCOTCH_LIBRARIES scotch)
+FIND_LIBRARY(SCOTCH_ERR_LIBRARIES scotcherr)
+SET(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${SCOTCH_ERR_LIBRARIES})
 FIND_PATH(SCOTCH_INCLUDE_DIRS scotch.h)
 
 INCLUDE(FindPackageHandleStandardArgs)

diff --git a/src/MEDPartitioner/CMakeLists.txt b/src/MEDPartitioner/CMakeLists.txt
index 2cbd32485a1d5d6495ea5299025c33c4bf222402..e89c23e4c2898e8a59a3ab267fea61b0b31f3671 100644 (file)
--- a/src/MEDPartitioner/CMakeLists.txt
+++ b/src/MEDPartitioner/CMakeLists.txt
@@ -33,10 +33,11 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints
   )
 
-IF(MED_ENABLE_SCOTCH)
+IF(SALOME_MED_PARTITIONER_SCOTCH)
   ADD_DEFINITIONS(${SCOTCH_DEFINITIONS})
+  ADD_DEFINITIONS("-DMED_ENABLE_SCOTCH")
   INCLUDE_DIRECTORIES(${SCOTCH_INCLUDE_DIRS})
-ENDIF(MED_ENABLE_SCOTCH)
+ENDIF(SALOME_MED_PARTITIONER_SCOTCH)
 
 IF(SALOME_MED_PARTITIONER_METIS)
   ADD_DEFINITIONS(${METIS_DEFINITIONS})
@@ -113,12 +114,12 @@ IF(SALOME_MED_PARTITIONER_METIS)
   SET(medpartitionercpp_DEFINITIONS "${medpartitionercpp_DEFINITIONS} ${METIS_DEFINITIONS}")
   SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${METIS_LIBRARIES})
 ENDIF(SALOME_MED_PARTITIONER_METIS)
-IF(MED_ENABLE_SCOTCH)
+IF(SALOME_MED_PARTITIONER_SCOTCH)
   SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_ScotchGraph.hxx)
   SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_ScotchGraph.cxx)
   SET(medpartitionercpp_DEFINITIONS "${medpartitionercpp_DEFINITIONS} ${SCOTCH_DEFINITIONS}")
-  SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${SCOTCH_LIBS})
-ENDIF(MED_ENABLE_SCOTCH)
+  SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${SCOTCH_LIBRARIES})
+ENDIF(SALOME_MED_PARTITIONER_SCOTCH)
 
 IF(SALOME_USE_MPI)
   SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES}