From: ageay Date: Tue, 16 Jul 2013 14:43:41 +0000 (+0000) Subject: Scotch and Metis the most beautiful install in the world ! X-Git-Tag: B4KillOfAutomake~12 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9f2f314357770d260ceb6048b0d553765af0e9e2;p=modules%2Fmed.git Scotch and Metis the most beautiful install in the world ! --- diff --git a/src/MEDPartitioner/CMakeLists.txt b/src/MEDPartitioner/CMakeLists.txt index 2c5c62dac..863d03082 100644 --- a/src/MEDPartitioner/CMakeLists.txt +++ b/src/MEDPartitioner/CMakeLists.txt @@ -33,18 +33,23 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints ) -IF(SALOME_MED_PARTITIONER_SCOTCH) - ADD_DEFINITIONS(${SCOTCH_DEFINITIONS}) - ADD_DEFINITIONS("-DMED_ENABLE_SCOTCH") - INCLUDE_DIRECTORIES(${SCOTCH_INCLUDE_DIRS}) -ENDIF(SALOME_MED_PARTITIONER_SCOTCH) - IF(SALOME_MED_PARTITIONER_METIS) ADD_DEFINITIONS(${METIS_DEFINITIONS}) ADD_DEFINITIONS("-DMED_ENABLE_METIS") INCLUDE_DIRECTORIES(${METIS_INCLUDE_DIRS}) ENDIF(SALOME_MED_PARTITIONER_METIS) + +######## +# VERY IMPORTANT PUT METIS BEFORE SCOTCH because +# metis.h is also in SCOTCH install dir !!! +######## +IF(SALOME_MED_PARTITIONER_SCOTCH) + ADD_DEFINITIONS(${SCOTCH_DEFINITIONS}) + ADD_DEFINITIONS("-DMED_ENABLE_SCOTCH") + INCLUDE_DIRECTORIES(${SCOTCH_INCLUDE_DIRS}) +ENDIF(SALOME_MED_PARTITIONER_SCOTCH) + IF(SALOME_MED_PARTITIONER_PARMETIS) ADD_DEFINITIONS(${PARMETIS_DEFINITIONS}) ADD_DEFINITIONS("-DMED_ENABLE_PARMETIS")