From c2f781e3adf6340a63dbef257e34684283f7ad4e Mon Sep 17 00:00:00 2001 From: ageay Date: Tue, 9 Jul 2013 10:13:53 +0000 Subject: [PATCH] Addition of SCOTCH in MEDPartitioner. --- CMakeLists.txt | 7 +++---- adm_local/cmake_files/CMakeLists.txt | 6 ++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 115ca4285..808126afb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,10 +17,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# TODO: write those in the new format, and load them via FIND_PACKAGE(): -#INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindPARMETIS.cmake) -#INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindMETIS.cmake) -#INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindSCOTCH.cmake) #IF(WIN32) # INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindXDR.cmake) #ENDIF(WIN32) @@ -91,6 +87,9 @@ IF(NOT SALOME_MED_MICROMED) IF(SALOME_MED_PARTITIONER_METIS) FIND_PACKAGE(SalomeMetis REQUIRED) ENDIF(SALOME_MED_PARTITIONER_METIS) + IF(SALOME_MED_PARTITIONER_SCOTCH) + FIND_PACKAGE(SalomeScotch REQUIRED) + ENDIF(SALOME_MED_PARTITIONER_SCOTCH) ENDIF(SALOME_MED_ENABLE_PARTITIONER) ENDIF(NOT SALOME_MED_MICROMED) diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt index b0b83f94a..9b0f47f19 100644 --- a/adm_local/cmake_files/CMakeLists.txt +++ b/adm_local/cmake_files/CMakeLists.txt @@ -20,10 +20,12 @@ SET(admlocal_cmake_DATA FindMED.cmake FindXDR.cmake - FindMETIS.cmake + FindMetis.cmake + FindSalomeMetis.cmake FindPARMETIS.cmake FindRENUMBER.cmake - FindSCOTCH.cmake + FindScotch.cmake + FindSalomeScotch.cmake FindSPLITTER.cmake ) -- 2.39.2