From 7665b8cd59f4eb6737206eb5ea5549cacd12b1de Mon Sep 17 00:00:00 2001 From: ageay Date: Tue, 9 Jul 2013 10:15:21 +0000 Subject: [PATCH] Addition of SCOTCH in MEDPartitioner. --- src/MEDPartitioner/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/MEDPartitioner/CMakeLists.txt b/src/MEDPartitioner/CMakeLists.txt index 2cbd32485..e89c23e4c 100644 --- 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} -- 2.39.2