From 585417d26b331c898c10823cd340d4a21525ef15 Mon Sep 17 00:00:00 2001 From: bruneton Date: Wed, 11 Sep 2013 09:18:50 +0000 Subject: [PATCH] CMake: minor modif: SALOME_USE_MPI inherits from KERNEL when not standalone. KERNEL_INCLUDE_DIRS loaded in the root CMakeLists.txt --- CMakeLists.txt | 12 ++++++++---- idl/CMakeLists.txt | 1 - .../Geometric2D/InterpKernelGeo2DNode.hxx | 3 ++- src/MEDCalculator/CMakeLists.txt | 1 - src/MEDCoupling/MEDCouplingUMesh.cxx | 2 +- src/MEDCouplingCorba/CMakeLists.txt | 1 - src/MEDCouplingCorba/Client/CMakeLists.txt | 1 - src/MEDCouplingCorba/Test/CMakeLists.txt | 1 - src/MEDCouplingCorba_Swig/CMakeLists.txt | 1 - src/MEDCouplingCorba_Swig/Client/CMakeLists.txt | 1 - src/MEDGUI/CMakeLists.txt | 1 - src/MEDOP/cmp/CMakeLists.txt | 1 - src/MEDOP/gui/CMakeLists.txt | 1 - src/MEDOP/gui/dialogs/CMakeLists.txt | 1 - src/ParaMEDCouplingCorba/CMakeLists.txt | 1 - src/ParaMEDMEMComponent/CMakeLists.txt | 1 - 16 files changed, 11 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 761e53ccf..bf211ec43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,12 +46,16 @@ SET(VERSION_DEV "0") # Kernel detection comes before user options to be # able to take previous values of SALOME_USE_MPI, SALOME_BUILD_DOC, etc ... # +SET(_default_MPI OFF) IF(NOT SALOME_MED_STANDALONE) SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") IF(EXISTS ${KERNEL_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") INCLUDE(SalomeMacros) FIND_PACKAGE(SalomeKERNEL REQUIRED) + ADD_DEFINITIONS(${KERNEL_DEFINITIONS}) + INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS}) + SET(_default_MPI ${SALOME_USE_MPI}) ELSE(EXISTS ${KERNEL_ROOT_DIR}) MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR or turn option SALOME_MED_STANDALONE to ON !") ENDIF(EXISTS ${KERNEL_ROOT_DIR}) @@ -72,13 +76,13 @@ 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_USE_MPI "(Use MPI containers) - For MED this triggers the build of ParaMEDMEM." ${_default_MPI}) OPTION(SALOME_BUILD_GUI "Build GUI of MED." ON) OPTION(SALOME_BUILD_TESTS "Build MED tests." ON) OPTION(SALOME_BUILD_DOC "Build MED doc." ON) -CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_METIS "Enable metis graph librarie in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;NOT SALOME_USE_MPI" OFF) -CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_SCOTCH "Enable scotch graph librarie in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;NOT SALOME_USE_MPI" OFF) -CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_PARMETIS "Enable parmetis graph librarie in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;SALOME_USE_MPI" OFF) +CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;NOT SALOME_USE_MPI" OFF) +CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;NOT SALOME_USE_MPI" OFF) +CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;SALOME_USE_MPI" OFF) # # Set list of prerequisites diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 8d3abc7cc..e8c8dee19 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -22,7 +22,6 @@ INCLUDE(UseOmniORB) INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx index b048a65af..01fc3125b 100644 --- a/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx +++ b/src/INTERP_KERNEL/Geometric2D/InterpKernelGeo2DNode.hxx @@ -44,7 +44,8 @@ namespace INTERP_KERNEL class Bounds; /*! - * As nodes can be shared between edges it is dealed with ref counting. + * Representation of a 2D point, and potentially its location relative to a polygon. + * As nodes can be shared between edges it is handled with ref counting. */ class INTERPKERNEL_EXPORT Node { diff --git a/src/MEDCalculator/CMakeLists.txt b/src/MEDCalculator/CMakeLists.txt index 0417d5c4f..958982e45 100644 --- a/src/MEDCalculator/CMakeLists.txt +++ b/src/MEDCalculator/CMakeLists.txt @@ -33,7 +33,6 @@ INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../idl ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba ${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader diff --git a/src/MEDCoupling/MEDCouplingUMesh.cxx b/src/MEDCoupling/MEDCouplingUMesh.cxx index bd2f9b5dc..8a76f4b78 100644 --- a/src/MEDCoupling/MEDCouplingUMesh.cxx +++ b/src/MEDCoupling/MEDCouplingUMesh.cxx @@ -8226,7 +8226,7 @@ MEDCouplingUMesh *MEDCouplingUMesh::Intersect2DMeshes(const MEDCouplingUMesh *m1 MEDCouplingAutoRefCountObjectPtr dd5(m1Desc),dd6(m2Desc); std::vector< std::vector > intersectEdge2; BuildIntersectEdges(m1Desc,m2Desc,addCoo,subDiv2,intersectEdge2); - subDiv2.clear(); dd5=0; dd6=0; + subDiv2.clear(); //dd5=0; dd6=0; std::vector cr,crI; //no DataArrayInt because interface with Geometric2D std::vector cNb1,cNb2; //no DataArrayInt because interface with Geometric2D BuildIntersecting2DCellsFromEdges(eps,m1,desc1->getConstPointer(),descIndx1->getConstPointer(),intersectEdge1,colinear2,m2,desc2->getConstPointer(),descIndx2->getConstPointer(),intersectEdge2,addCoo, diff --git a/src/MEDCouplingCorba/CMakeLists.txt b/src/MEDCouplingCorba/CMakeLists.txt index 1b1e25262..57f427971 100644 --- a/src/MEDCouplingCorba/CMakeLists.txt +++ b/src/MEDCouplingCorba/CMakeLists.txt @@ -28,7 +28,6 @@ ENDIF(SALOME_BUILD_TESTS) INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../idl ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL diff --git a/src/MEDCouplingCorba/Client/CMakeLists.txt b/src/MEDCouplingCorba/Client/CMakeLists.txt index 90fb58210..260c49e32 100644 --- a/src/MEDCouplingCorba/Client/CMakeLists.txt +++ b/src/MEDCouplingCorba/Client/CMakeLists.txt @@ -20,7 +20,6 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../../idl ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL diff --git a/src/MEDCouplingCorba/Test/CMakeLists.txt b/src/MEDCouplingCorba/Test/CMakeLists.txt index 48bb20dd8..940e7d83c 100644 --- a/src/MEDCouplingCorba/Test/CMakeLists.txt +++ b/src/MEDCouplingCorba/Test/CMakeLists.txt @@ -22,7 +22,6 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ${CPPUNIT_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../../idl ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../Client diff --git a/src/MEDCouplingCorba_Swig/CMakeLists.txt b/src/MEDCouplingCorba_Swig/CMakeLists.txt index 0fd808c19..bd523c13d 100644 --- a/src/MEDCouplingCorba_Swig/CMakeLists.txt +++ b/src/MEDCouplingCorba_Swig/CMakeLists.txt @@ -37,7 +37,6 @@ SET(MEDCouplingCorba_SWIG_DPYS_FILES INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../idl ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba diff --git a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt index 1de621b6a..03a46a352 100644 --- a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt +++ b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt @@ -32,7 +32,6 @@ ENDIF(NUMPY_FOUND) INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../../idl ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCouplingCorba/Client diff --git a/src/MEDGUI/CMakeLists.txt b/src/MEDGUI/CMakeLists.txt index d149e702f..7bd029b92 100644 --- a/src/MEDGUI/CMakeLists.txt +++ b/src/MEDGUI/CMakeLists.txt @@ -42,7 +42,6 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../../idl diff --git a/src/MEDOP/cmp/CMakeLists.txt b/src/MEDOP/cmp/CMakeLists.txt index 82f1dcc69..29a75a279 100644 --- a/src/MEDOP/cmp/CMakeLists.txt +++ b/src/MEDOP/cmp/CMakeLists.txt @@ -24,7 +24,6 @@ INCLUDE_DIRECTORIES( ${MEDFILE_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/MEDCoupling diff --git a/src/MEDOP/gui/CMakeLists.txt b/src/MEDOP/gui/CMakeLists.txt index 534be68b0..7fc2540d4 100644 --- a/src/MEDOP/gui/CMakeLists.txt +++ b/src/MEDOP/gui/CMakeLists.txt @@ -45,7 +45,6 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/dialogs diff --git a/src/MEDOP/gui/dialogs/CMakeLists.txt b/src/MEDOP/gui/dialogs/CMakeLists.txt index f30ace799..3cf171b80 100644 --- a/src/MEDOP/gui/dialogs/CMakeLists.txt +++ b/src/MEDOP/gui/dialogs/CMakeLists.txt @@ -59,7 +59,6 @@ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${KERNEL_INCLUDE_DIRS} ${GUI_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${QT4_INCLUDE_DIRECTORY} diff --git a/src/ParaMEDCouplingCorba/CMakeLists.txt b/src/ParaMEDCouplingCorba/CMakeLists.txt index 3221c59b9..af0e04ee1 100644 --- a/src/ParaMEDCouplingCorba/CMakeLists.txt +++ b/src/ParaMEDCouplingCorba/CMakeLists.txt @@ -20,7 +20,6 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${MPI_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../idl ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling diff --git a/src/ParaMEDMEMComponent/CMakeLists.txt b/src/ParaMEDMEMComponent/CMakeLists.txt index 1caba462e..d58eb8769 100644 --- a/src/ParaMEDMEMComponent/CMakeLists.txt +++ b/src/ParaMEDMEMComponent/CMakeLists.txt @@ -22,7 +22,6 @@ ADD_DEFINITIONS(${MPI_DEFINITIONS} ${OMNIORB_DEFINITIONS}) INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${MPI_INCLUDE_DIRS} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../idl ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDMEM ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDCouplingCorba -- 2.30.2