X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FRENUMBER%2FCMakeLists.txt;h=52ef7c7f3f5018bf8e11e94bab0ad8a72d2054d3;hb=aba57931b1c17331fb3618c095efcf822dc151b5;hp=66b984c794323352c59bb89925ea6462a3f96f50;hpb=10f37bf6f33a762626d7f1093b2f5450c1688667;p=tools%2Fmedcoupling.git

diff --git a/src/RENUMBER/CMakeLists.txt b/src/RENUMBER/CMakeLists.txt
index 66b984c79..52ef7c7f3 100644
--- a/src/RENUMBER/CMakeLists.txt
+++ b/src/RENUMBER/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2015  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,12 +17,18 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${BOOST_DEFINITIONS} ${MEDFILE_DEFINITIONS})
+
+IF(Boost_FOUND)
+  ADD_DEFINITIONS("-DENABLE_BOOST")
+ENDIF(Boost_FOUND)
+
+# Include directories
 INCLUDE_DIRECTORIES(
-  ${BOOST_INCLUDE_DIRS}
-  ${METIS_INCLUDE_DIRS}
-  ${MED3_INCLUDE_DIRS}
+  ${MEDFILE_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM
+  ${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader
+  ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D
@@ -30,6 +36,11 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints
   )
 
+IF(MEDCOUPLING_USE_MPI)
+  ADD_DEFINITIONS(${MPI_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${MPI_INCLUDE_DIRS})
+ENDIF(MEDCOUPLING_USE_MPI)
+
 SET(renumbercpp_HEADERS_HXX
   RENUMBER_Renumbering.hxx
   RenumberingFactory.hxx
@@ -45,31 +56,41 @@ SET(renumber_SOURCES
   renumbering.cxx
   )
 
-SET(renumbercpp_LDFLAGS medmem)
-SET(renumber_DEFINITIONS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${BOOST_DEFINITIONS}")
+SET(renumbercpp_LDFLAGS medloader)
+
+IF(PARMETIS_FOUND)
+  INCLUDE_DIRECTORIES(${PARMETIS_INCLUDE_DIRS})
+ENDIF(PARMETIS_FOUND)
+
+IF(METIS_FOUND)
+  INCLUDE_DIRECTORIES(${METIS_INCLUDE_DIRS})
 
-IF(MED_ENABLE_METIS)
   SET(renumbercpp_SOURCES ${renumbercpp_SOURCES} RENUMBER_METISRenumbering.cxx)
   SET(renumbercpp_HEADERS_HXX ${renumbercpp_HEADERS_HXX} RENUMBER_METISRenumbering.hxx)
-  SET(renumbercpp_LDFLAGS ${renumbercpp_LDFLAGS} ${METIS_LIBS})
+  SET(renumbercpp_LDFLAGS ${renumbercpp_LDFLAGS} ${METIS_LIBRARIES})
   SET(renumber_DEFINITIONS "${renumber_DEFINITIONS} ${METIS_DEFINITIONS}")
-ENDIF(MED_ENABLE_METIS)
+ENDIF(METIS_FOUND)
+
+IF(Boost_FOUND)
+  INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 
-IF(BOOST_STATUS)
   SET(renumbercpp_SOURCES ${renumbercpp_SOURCES} RENUMBER_BOOSTRenumbering.cxx)
   SET(renumbercpp_HEADERS_HXX ${renumbercpp_HEADERS_HXX} RENUMBER_BOOSTRenumbering.hxx)
-  SET(renumbercpp_LDFLAGS ${renumbercpp_LDFLAGS} ${BOOST_LIBS})
-  SET(renumber_DEFINITIONS "${renumber_DEFINITIONS} ${BOOST_DEFINITIONS} -DENABLE_BOOST")
-ENDIF(BOOST_STATUS)
+  SET(renumbercpp_LDFLAGS ${renumbercpp_LDFLAGS} ${BOOST_LIBRARIES})
+ENDIF(Boost_FOUND)
+
+IF(MEDCOUPLING_USE_MPI)
+  SET(renumbercpp_LDFLAGS ${renumbercpp_LDFLAGS} ${MPI_LIBRARIES})
+ENDIF(MEDCOUPLING_USE_MPI)
 
 ADD_EXECUTABLE(renumber ${renumber_SOURCES})
 SET_TARGET_PROPERTIES(renumber PROPERTIES COMPILE_FLAGS "${renumber_DEFINITIONS}")
 TARGET_LINK_LIBRARIES(renumber renumbercpp)
-INSTALL(TARGETS renumber DESTINATION ${MED_salomebin_BINS})
+INSTALL(TARGETS renumber DESTINATION ${MEDCOUPLING_INSTALL_BINS})
 
 ADD_LIBRARY(renumbercpp SHARED ${renumbercpp_SOURCES})
 SET_TARGET_PROPERTIES(renumbercpp PROPERTIES COMPILE_FLAGS "${renumber_DEFINITIONS}")
 TARGET_LINK_LIBRARIES(renumbercpp ${renumbercpp_LDFLAGS})
-INSTALL(TARGETS renumbercpp DESTINATION ${MED_salomelib_LIBS})
+INSTALL(TARGETS renumbercpp DESTINATION ${MEDCOUPLING_INSTALL_LIBS})
 
-INSTALL(FILES ${renumbercpp_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS})
+INSTALL(FILES ${renumbercpp_HEADERS_HXX} DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})