Salome HOME
projects
/
tools
/
medcoupling.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0bf52b9
)
CMake: Avoid linking to Python libs
jsr/pylink
5/head
author
Julien Schueller
<schueller@phimeca.com>
Wed, 10 Apr 2024 13:28:36 +0000
(15:28 +0200)
committer
Julien Schueller
<schueller@phimeca.com>
Wed, 10 Apr 2024 13:28:36 +0000
(15:28 +0200)
src/MEDLoader/Swig/CMakeLists.txt
patch
|
blob
|
history
src/MEDPartitioner_Swig/CMakeLists.txt
patch
|
blob
|
history
src/ParaMEDMEM_Swig/CMakeLists.txt
patch
|
blob
|
history
src/RENUMBER_Swig/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/src/MEDLoader/Swig/CMakeLists.txt
b/src/MEDLoader/Swig/CMakeLists.txt
index 2cc09ced6c1f8a28480fcc6677066af3b9c76d96..6cf7826d025a8f76f6e80828ac1067202302f6cd 100644
(file)
--- a/
src/MEDLoader/Swig/CMakeLists.txt
+++ b/
src/MEDLoader/Swig/CMakeLists.txt
@@
-83,7
+83,12
@@
ELSE()
SWIG_ADD_LIBRARY(MEDLoader LANGUAGE python SOURCES MEDLoader.i)
ENDIF()
SWIG_ADD_LIBRARY(MEDLoader LANGUAGE python SOURCES MEDLoader.i)
ENDIF()
-SWIG_LINK_LIBRARIES(MEDLoader ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} medloader medcouplingcpp )
+SWIG_LINK_LIBRARIES(MEDLoader ${PLATFORM_LIBS} medloader medcouplingcpp)
+IF (WIN32)
+ # ${PYTHON_LIBRARIES} not needed see https://www.python.org/dev/peps/pep-0513/#libpythonx-y-so-1
+ SWIG_LINK_LIBRARIES(MEDLoader ${PYTHON_LIBRARIES})
+ENDIF()
+
SWIG_CHECK_GENERATION(MEDLoader)
IF(WIN32)
SET_TARGET_PROPERTIES(_MEDLoader PROPERTIES DEBUG_OUTPUT_NAME _MEDLoader_d)
SWIG_CHECK_GENERATION(MEDLoader)
IF(WIN32)
SET_TARGET_PROPERTIES(_MEDLoader PROPERTIES DEBUG_OUTPUT_NAME _MEDLoader_d)
diff --git
a/src/MEDPartitioner_Swig/CMakeLists.txt
b/src/MEDPartitioner_Swig/CMakeLists.txt
index 696df4459f9a7b868ce39e63bc33990bcec7231e..ec94ab56d5ea88926c154084c04a4cdd9e357b28 100644
(file)
--- a/
src/MEDPartitioner_Swig/CMakeLists.txt
+++ b/
src/MEDPartitioner_Swig/CMakeLists.txt
@@
-62,7
+62,11
@@
ELSE()
SWIG_ADD_LIBRARY(MEDPartitioner LANGUAGE python SOURCES MEDPartitioner.i)
ENDIF()
SWIG_ADD_LIBRARY(MEDPartitioner LANGUAGE python SOURCES MEDPartitioner.i)
ENDIF()
-SWIG_LINK_LIBRARIES(MEDPartitioner ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} medpartitionercpp)
+SWIG_LINK_LIBRARIES(MEDPartitioner ${PLATFORM_LIBS} medpartitionercpp)
+IF (WIN32)
+ # ${PYTHON_LIBRARIES} not needed see https://www.python.org/dev/peps/pep-0513/#libpythonx-y-so-1
+ SWIG_LINK_LIBRARIES(MEDPartitioner ${PYTHON_LIBRARIES})
+ENDIF()
SWIG_CHECK_GENERATION(MEDPartitioner)
IF(WIN32)
SWIG_CHECK_GENERATION(MEDPartitioner)
IF(WIN32)
diff --git
a/src/ParaMEDMEM_Swig/CMakeLists.txt
b/src/ParaMEDMEM_Swig/CMakeLists.txt
index 4e7f502b4376b9b1c079b434def21c32f31a3696..600e1973f52508f9c5d8460300200acb0144be11 100644
(file)
--- a/
src/ParaMEDMEM_Swig/CMakeLists.txt
+++ b/
src/ParaMEDMEM_Swig/CMakeLists.txt
@@
-64,7
+64,11
@@
ELSE()
SWIG_ADD_LIBRARY(ParaMEDMEM LANGUAGE python SOURCES ParaMEDMEM.i)
ENDIF()
SWIG_ADD_LIBRARY(ParaMEDMEM LANGUAGE python SOURCES ParaMEDMEM.i)
ENDIF()
-SWIG_LINK_LIBRARIES(ParaMEDMEM ${PYTHON_LIBRARIES} paramedmem)
+SWIG_LINK_LIBRARIES(ParaMEDMEM paramedmem)
+IF (WIN32)
+ # ${PYTHON_LIBRARIES} not needed see https://www.python.org/dev/peps/pep-0513/#libpythonx-y-so-1
+ SWIG_LINK_LIBRARIES(ParaMEDMEM ${PYTHON_LIBRARIES})
+ENDIF ()
SWIG_CHECK_GENERATION(ParaMEDMEM)
#
SWIG_CHECK_GENERATION(ParaMEDMEM)
#
diff --git
a/src/RENUMBER_Swig/CMakeLists.txt
b/src/RENUMBER_Swig/CMakeLists.txt
index 462bcb34812e5ce3c1975ffc03d01801da40771e..929d2b10816790a2313b4c3a5abe136be6227acc 100644
(file)
--- a/
src/RENUMBER_Swig/CMakeLists.txt
+++ b/
src/RENUMBER_Swig/CMakeLists.txt
@@
-65,7
+65,11
@@
ELSE()
SWIG_ADD_LIBRARY(MEDRenumber LANGUAGE python SOURCES MEDRenumber.i)
ENDIF()
SWIG_ADD_LIBRARY(MEDRenumber LANGUAGE python SOURCES MEDRenumber.i)
ENDIF()
-SWIG_LINK_LIBRARIES(MEDRenumber ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} renumbercpp)
+SWIG_LINK_LIBRARIES(MEDRenumber ${PLATFORM_LIBS} renumbercpp)
+IF (WIN32)
+ # ${PYTHON_LIBRARIES} not needed see https://www.python.org/dev/peps/pep-0513/#libpythonx-y-so-1
+ SWIG_LINK_LIBRARIES(MEDRenumber ${PYTHON_LIBRARIES})
+ENDIF()
SWIG_CHECK_GENERATION(MEDRenumber)
IF(WIN32)
SWIG_CHECK_GENERATION(MEDRenumber)
IF(WIN32)