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
Merge branch 'agr/medcoupling_tool'
[tools/medcoupling.git]
/
src
/
ParaMEDLoader
/
CMakeLists.txt
diff --git
a/src/ParaMEDLoader/CMakeLists.txt
b/src/ParaMEDLoader/CMakeLists.txt
index d9a0a23f30c6fc0d5807712fe5630f107f2e5f8f..2edf2a29d7c85ddb97983cbfb2be297723f8481c 100644
(file)
--- a/
src/ParaMEDLoader/CMakeLists.txt
+++ b/
src/ParaMEDLoader/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
4
CEA/DEN, EDF R&D
+# Copyright (C) 2012-201
5
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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-18,7
+18,11
@@
#
# Author : Anthony Geay (CEA/DEN)
#
# Author : Anthony Geay (CEA/DEN)
-ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS})
+ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${MPI_DEFINITIONS})
+
+IF(HDF5_ENABLE_PARALLEL OR HDF5_IS_PARALLEL)
+ ADD_DEFINITIONS("-DHDF5_IS_PARALLEL")
+ENDIF(HDF5_ENABLE_PARALLEL OR HDF5_IS_PARALLEL)
INCLUDE_DIRECTORIES(
${MPI_INCLUDE_DIRS}
INCLUDE_DIRECTORIES(
${MPI_INCLUDE_DIRS}
@@
-34,11
+38,12
@@
INCLUDE_DIRECTORIES(
SET(paramedloader_SOURCES
ParaMEDLoader.cxx
SET(paramedloader_SOURCES
ParaMEDLoader.cxx
+ ParaMEDFileMesh.cxx
)
ADD_LIBRARY(paramedloader SHARED ${paramedloader_SOURCES})
TARGET_LINK_LIBRARIES(paramedloader paramedmem medloader ${PLATFORM_LIBS})
)
ADD_LIBRARY(paramedloader SHARED ${paramedloader_SOURCES})
TARGET_LINK_LIBRARIES(paramedloader paramedmem medloader ${PLATFORM_LIBS})
-INSTALL(TARGETS paramedloader EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${
SALOME
_INSTALL_LIBS})
+INSTALL(TARGETS paramedloader EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${
MEDCOUPLING
_INSTALL_LIBS})
FILE(GLOB paramedloader_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
FILE(GLOB paramedloader_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-INSTALL(FILES ${paramedloader_HEADERS_HXX} DESTINATION ${
SALOME
_INSTALL_HEADERS})
+INSTALL(FILES ${paramedloader_HEADERS_HXX} DESTINATION ${
MEDCOUPLING
_INSTALL_HEADERS})