Addition of SCOTCH in MEDPartitioner.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 808126afb12c343723d64f879a87307fc4094e1a..52524ead85df8917fe3175bcafd51817233240ea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,13 +72,14 @@ IF(NOT SALOME_MED_STANDALONE)
     MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR or turn option SALOME_MED_STANDALONE to ON !")
   ENDIF(EXISTS ${KERNEL_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
-  LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeOmniORB REQUIRED)
 ELSE(NOT SALOME_MED_STANDALONE)
   LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local_without_kernel/cmake_files")
   INCLUDE(SalomeMacros)
 ENDIF(NOT SALOME_MED_STANDALONE)
 
+LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
+
 IF(NOT SALOME_MED_MICROMED)
   FIND_PACKAGE(SalomeHDF5 REQUIRED)
   FIND_PACKAGE(SalomeMEDFile REQUIRED)

diff --git a/src/MEDPartitioner/CMakeLists.txt b/src/MEDPartitioner/CMakeLists.txt
index e89c23e4c2898e8a59a3ab267fea61b0b31f3671..0e13e49f118480418fb7bec8fe4566d011bf8df1 100644 (file)
--- a/src/MEDPartitioner/CMakeLists.txt
+++ b/src/MEDPartitioner/CMakeLists.txt
@@ -97,7 +97,6 @@ SET(medpartitionercpp_LDFLAGS
   ${HDF5_LIBRARIES}
   ${STDLIB}
   ${LIBXML2_LIBRARIES}
-  ${MPI_LIBRARIES}
   interpkernel
   medcoupling
   medloader
@@ -121,16 +120,14 @@ IF(SALOME_MED_PARTITIONER_SCOTCH)
   SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${SCOTCH_LIBRARIES})
 ENDIF(SALOME_MED_PARTITIONER_SCOTCH)
 
-IF(SALOME_USE_MPI)
-  SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES}
-    MEDPARTITIONER_UtilsPara.cxx
-    MEDPARTITIONER_JointFinder.cxx
-  )
-ADD_EXECUTABLE(medpartitioner_para medpartitioner_para.cxx)
+IF(${SALOME_USE_MPI})
+  SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_UtilsPara.cxx MEDPARTITIONER_JointFinder.cxx)
+  ADD_EXECUTABLE(medpartitioner_para medpartitioner_para.cxx)
+  SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${MPI_LIBRARIES})
   SET_TARGET_PROPERTIES(medpartitioner_para PROPERTIES COMPILE_FLAGS "${medpartitionercpp_DEFINITIONS}")
   TARGET_LINK_LIBRARIES(medpartitioner_para medpartitionercpp ${medpartitionercpp_LDFLAGS})
   INSTALL(TARGETS medpartitioner_para DESTINATION ${SALOME_INSTALL_BINS})
-ENDIF(SALOME_USE_MPI)                    
+ENDIF(${SALOME_USE_MPI})                         
   
 ADD_LIBRARY(medpartitionercpp SHARED ${medpartitionercpp_SOURCES})
 SET_TARGET_PROPERTIES(medpartitionercpp PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS} ${medpartitionercpp_DEFINITIONS}")

diff --git a/src/MEDPartitioner/MEDPARTITIONER_metis.c b/src/MEDPartitioner/MEDPARTITIONER_metis.c
index 0a7e241e8381bd7ffde291a7beba02771f811d91..98ef41eeee3bcd86ec3a616d95d0e53ba3056f21 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_metis.c
+++ b/src/MEDPartitioner/MEDPARTITIONER_metis.c
@@ -27,7 +27,9 @@
 #include "MEDPARTITIONER_metis.h"
 
 #if defined(MED_ENABLE_METIS)
-  #include <metis.h>
+  #include "defs.h"
+  #include "struct.h"
+  #include "metis.h"
 #else
   typedef int idxtype;
 #endif