Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correction of Renaud.
[tools/medcoupling.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 959fc7ca56a1c9c33734c6e2b81324db9ae26811..df0de11346ce86edd9a071a1289c28216161d4ff 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-17,12
+17,8
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# 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)
#IF(WIN32)
-# INCLUDE(${
CMAKE
_SOURCE_DIR}/adm_local/cmake_files/FindXDR.cmake)
+# INCLUDE(${
PROJECT
_SOURCE_DIR}/adm_local/cmake_files/FindXDR.cmake)
#ENDIF(WIN32)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
#ENDIF(WIN32)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
@@
-54,6
+50,7
@@
OPTION(SALOME_MED_STANDALONE "Build MED without CORBA bindings. When OFF, exchan
OPTION(SALOME_MED_MICROMED "Build MED without MED file dependancy." OFF)
OPTION(SALOME_MED_ENABLE_PYTHON "Build PYTHON bindings." ON)
OPTION(SALOME_MED_ENABLE_PARTITIONER "Build MEDPartitioner." ON)
OPTION(SALOME_MED_MICROMED "Build MED without MED file dependancy." OFF)
OPTION(SALOME_MED_ENABLE_PYTHON "Build PYTHON bindings." ON)
OPTION(SALOME_MED_ENABLE_PARTITIONER "Build MEDPartitioner." ON)
+OPTION(SALOME_MED_ENABLE_RENUMBER "Build Renumber." ON)
OPTION(SALOME_USE_MPI "To build ParaMEDMEM." OFF)
OPTION(SALOME_BUILD_GUI "Build GUI of MED." ON)
OPTION(SALOME_BUILD_TESTS "Build MED tests." ON)
OPTION(SALOME_USE_MPI "To build ParaMEDMEM." OFF)
OPTION(SALOME_BUILD_GUI "Build GUI of MED." ON)
OPTION(SALOME_BUILD_TESTS "Build MED tests." ON)
@@
-82,11
+79,19
@@
ELSE(NOT SALOME_MED_STANDALONE)
INCLUDE(SalomeMacros)
ENDIF(NOT SALOME_MED_STANDALONE)
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)
IF(SALOME_MED_ENABLE_PARTITIONER)
FIND_PACKAGE(SalomeLibXml2 REQUIRED)
IF(NOT SALOME_MED_MICROMED)
FIND_PACKAGE(SalomeHDF5 REQUIRED)
FIND_PACKAGE(SalomeMEDFile REQUIRED)
IF(SALOME_MED_ENABLE_PARTITIONER)
FIND_PACKAGE(SalomeLibXml2 REQUIRED)
+ 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)
ENDIF(SALOME_MED_ENABLE_PARTITIONER)
ENDIF(NOT SALOME_MED_MICROMED)
@@
-113,8
+118,15
@@
ENDIF(SALOME_BUILD_TESTS)
IF(SALOME_USE_MPI)
FIND_PACKAGE(SalomeMPI REQUIRED)
IF(SALOME_USE_MPI)
FIND_PACKAGE(SalomeMPI REQUIRED)
+ IF(SALOME_MED_PARTITIONER_PARMETIS)
+ FIND_PACKAGE(SalomeParMetis REQUIRED)
+ ENDIF(SALOME_MED_PARTITIONER_PARMETIS)
ENDIF(SALOME_USE_MPI)
ENDIF(SALOME_USE_MPI)
+IF(SALOME_MED_ENABLE_RENUMBER)
+ FIND_PACKAGE(SalomeBoost)
+ENDIF(SALOME_MED_ENABLE_RENUMBER)
+
IF(SALOME_BUILD_DOC)
FIND_PACKAGE(SalomeDoxygen REQUIRED)
FIND_PACKAGE(SalomeGraphviz) # Remains optional even here.
IF(SALOME_BUILD_DOC)
FIND_PACKAGE(SalomeDoxygen REQUIRED)
FIND_PACKAGE(SalomeGraphviz) # Remains optional even here.
@@
-126,11
+138,6
@@
IF(SALOME_MED_ENABLE_PYTHON)
FIND_PACKAGE(SalomeSWIG REQUIRED)
ENDIF(SALOME_MED_ENABLE_PYTHON)
FIND_PACKAGE(SalomeSWIG REQUIRED)
ENDIF(SALOME_MED_ENABLE_PYTHON)
-IF(NOT SALOME_MED_MICROMED)
- FIND_PACKAGE(SalomeMEDFile REQUIRED)
-ENDIF(NOT SALOME_MED_MICROMED)
-
-
# Directories
#
# Directories have to be given after prerequisites (to be able to use
# Directories
#
# Directories have to be given after prerequisites (to be able to use