X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDPartitioner%2FCMakeLists.txt;h=bdb3a74d44cc07f2dee75f489ee3b4b6f5fe16bc;hb=b307fa3ee9c6d9e08082e2ccc832b28a17fd6d2c;hp=981fc949a665b79b15db1f88c9cdcf87bc0c366c;hpb=773a834dad12352f0d108db6dec5aac713290909;p=tools%2Fmedcoupling.git diff --git a/src/MEDPartitioner/CMakeLists.txt b/src/MEDPartitioner/CMakeLists.txt index 981fc949a..bdb3a74d4 100644 --- a/src/MEDPartitioner/CMakeLists.txt +++ b/src/MEDPartitioner/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2016 CEA/DEN, EDF R&D +# Copyright (C) 2012-2021 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,6 +19,10 @@ ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${LIBXML2_DEFINITIONS}) +IF (NOT DEFINED MSVC) + ADD_DEFINITIONS(-Wsign-compare -Wconversion) +ENDIF() + INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} ${MEDFILE_INCLUDE_DIRS} @@ -46,6 +50,11 @@ ENDIF(MEDCOUPLING_PARTITIONER_METIS) # VERY IMPORTANT PUT METIS BEFORE SCOTCH because # metis.h is also in SCOTCH install dir !!! ######## +IF(MEDCOUPLING_PARTITIONER_PTSCOTCH) + ADD_DEFINITIONS(${PTSCOTCH_DEFINITIONS}) + INCLUDE_DIRECTORIES(${PTSCOTCH_INCLUDE_DIRS}) +ENDIF(MEDCOUPLING_PARTITIONER_PTSCOTCH) + IF(MEDCOUPLING_PARTITIONER_SCOTCH) ADD_DEFINITIONS(${SCOTCH_DEFINITIONS}) INCLUDE_DIRECTORIES(${SCOTCH_INCLUDE_DIRS}) @@ -103,8 +112,9 @@ SET(medpartitionercpp_LDFLAGS ${STDLIB} ${LIBXML2_LIBRARIES} interpkernel - medcoupling + medcouplingcpp medloader + -lpthread ) IF(MEDCOUPLING_PARTITIONER_PARMETIS) SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_ParMetisGraph.hxx) @@ -124,6 +134,12 @@ IF(MEDCOUPLING_PARTITIONER_SCOTCH) SET(medpartitionercpp_DEFINITIONS "${medpartitionercpp_DEFINITIONS} ${SCOTCH_DEFINITIONS}") SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${SCOTCH_LIBRARIES}) ENDIF(MEDCOUPLING_PARTITIONER_SCOTCH) +IF(MEDCOUPLING_PARTITIONER_PTSCOTCH) + SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_PTScotchGraph.hxx) + SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_PTScotchGraph.cxx) + SET(medpartitionercpp_DEFINITIONS "${medpartitionercpp_DEFINITIONS} ${PTSCOTCH_DEFINITIONS}") + SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${PTSCOTCH_LIBRARIES}) +ENDIF(MEDCOUPLING_PARTITIONER_PTSCOTCH) IF(${MEDCOUPLING_USE_MPI}) SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_UtilsPara.cxx MEDPARTITIONER_JointFinder.cxx)