Salome HOME
projects
/
modules
/
med.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmake 3.12 porting to deal with // compilation
[modules/med.git]
/
src
/
MEDCouplingCorba_Swig
/
Client
/
CMakeLists.txt
diff --git
a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
index 526d240e1c69535a6bfa912ae38f466b141ba58d..cb095ad2a8d19d5449e5e8f4ba7e2e94d757272a 100644
(file)
--- a/
src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
+++ b/
src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
5
CEA/DEN, EDF R&D
+# Copyright (C) 2012-201
6
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,28
+18,32
@@
#
# Author : Anthony Geay (CEA/DEN)
#
# Author : Anthony Geay (CEA/DEN)
-ADD_DEFINITIONS(${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS})
+ADD_DEFINITIONS(${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS}
${NUMPY_DEFINITIONS} ${SCIPY_DEFINITIONS}
)
FIND_PACKAGE(SWIG REQUIRED)
INCLUDE(${SWIG_USE_FILE})
SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES CPLUSPLUS ON)
FIND_PACKAGE(SWIG REQUIRED)
INCLUDE(${SWIG_USE_FILE})
SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES CPLUSPLUS ON)
-SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES SWIG_
DEFINITIONS "-shadow
")
-SET(SWIG_MODULE_MEDCouplingClient_EXTRA_FLAGS
${SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY}
)
+SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES SWIG_
FLAGS "-py3
")
+SET(SWIG_MODULE_MEDCouplingClient_EXTRA_FLAGS
"${NUMPY_DEFINITIONS};${SCIPY_DEFINITIONS}"
)
INCLUDE_DIRECTORIES(
${PYTHON_INCLUDE_DIRS}
INCLUDE_DIRECTORIES(
${PYTHON_INCLUDE_DIRS}
+ ${NUMPY_INCLUDE_DIR}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
+ ${MEDCOUPLING_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}/../../../idl
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCouplingCorba/Client
${CMAKE_CURRENT_BINARY_DIR}/../../../idl
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCouplingCorba/Client
- ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling_Swig
- ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling
- ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL
- ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/Bases
)
)
-SWIG_ADD_MODULE(MEDCouplingClient python MEDCouplingClient.i)
+
+IF(${CMAKE_VERSION} VERSION_LESS "3.8.0")
+ SWIG_ADD_MODULE(MEDCouplingClient python MEDCouplingClient.i)
+ELSE()
+ SWIG_ADD_LIBRARY(MEDCouplingClient LANGUAGE python SOURCES MEDCouplingClient.i)
+ENDIF()
+
SWIG_LINK_LIBRARIES(MEDCouplingClient ${PYTHON_LIBRARIES} medcouplingclient)
IF(WIN32)
SET_TARGET_PROPERTIES(_MEDCouplingClient PROPERTIES DEBUG_OUTPUT_NAME _MEDCouplingClient_d)
SWIG_LINK_LIBRARIES(MEDCouplingClient ${PYTHON_LIBRARIES} medcouplingclient)
IF(WIN32)
SET_TARGET_PROPERTIES(_MEDCouplingClient PROPERTIES DEBUG_OUTPUT_NAME _MEDCouplingClient_d)
@@
-48,4
+52,4
@@
ENDIF(WIN32)
INSTALL(TARGETS _MEDCouplingClient DESTINATION ${SALOME_INSTALL_PYTHON})
INSTALL(FILES MEDCouplingClient.i DESTINATION ${SALOME_INSTALL_HEADERS})
SET(PYFILES_TO_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/MEDCouplingClient.py)
INSTALL(TARGETS _MEDCouplingClient DESTINATION ${SALOME_INSTALL_PYTHON})
INSTALL(FILES MEDCouplingClient.i DESTINATION ${SALOME_INSTALL_HEADERS})
SET(PYFILES_TO_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/MEDCouplingClient.py)
-
INSTALL_AND_COMPILE_PYTHON_FILE("${PYFILES_TO_INSTALL}" ${SALOME_INSTALL_PYTHON}
)
+
SALOME_INSTALL_SCRIPTS("${PYFILES_TO_INSTALL}" ${SALOME_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_MEDCouplingClient_REAL_NAME}"
)