med/med_cmake.patch

65 lines
4.2 KiB
Diff
Raw Normal View History

2020-07-30 14:25:00 +00:00
diff -rupN --no-dereference med-4.1.0/CMakeLists.txt med-4.1.0-new/CMakeLists.txt
--- med-4.1.0/CMakeLists.txt 2020-03-12 16:45:46.000000000 +0100
2021-12-03 08:51:15 +00:00
+++ med-4.1.0-new/CMakeLists.txt 2021-12-03 09:32:31.544994485 +0100
2020-07-30 14:25:00 +00:00
@@ -101,9 +101,9 @@ ENDIF(WIN32)
2018-03-09 23:02:37 +00:00
IF(WIN32 AND NOT CYGWIN)
SET(INSTALL_CMAKE_CONFIG_DIR cmake)
ELSE()
2019-03-13 10:29:40 +00:00
- SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/med-fichier-${MED_STR_VERSION})
2020-07-30 14:25:00 +00:00
+ SET(INSTALL_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/MEDFile)
2018-03-09 23:02:37 +00:00
ENDIF()
-SET(INSTALL_INCLUDE_DIR include)
+SET(INSTALL_INCLUDE_DIR include/med)
## Pre-requisites detection
# Detect HDF5 first to potentially retrieve MPI automatically:
2020-07-30 14:25:00 +00:00
@@ -144,8 +144,8 @@ ENDIF()
2019-03-13 10:29:40 +00:00
## Installation of the doc
IF(MEDFILE_INSTALL_DOC OR MEDFILE_BUILD_DOC)
- INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE)
- INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png")
+ INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE)
+ INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png")
ENDIF()
#######################
2020-07-30 14:25:00 +00:00
diff -rupN --no-dereference med-4.1.0/config/cmake_files/medMacros.cmake med-4.1.0-new/config/cmake_files/medMacros.cmake
--- med-4.1.0/config/cmake_files/medMacros.cmake 2020-01-30 17:04:19.000000000 +0100
2021-12-03 08:51:15 +00:00
+++ med-4.1.0-new/config/cmake_files/medMacros.cmake 2021-12-03 09:32:31.545994485 +0100
2020-07-30 14:25:00 +00:00
@@ -505,9 +505,9 @@ MACRO(INSTALL_AND_COMPILE_PYTHON_FILE PY
2018-03-09 23:02:37 +00:00
FOREACH(input ${PYFILE2COMPINST})
GET_FILENAME_COMPONENT(inputname ${input} NAME)
INSTALL(FILES ${input} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYFILELOC})
2020-07-30 14:25:00 +00:00
- INSTALL(CODE "MESSAGE(STATUS \"py compiling \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
- INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
2018-03-09 23:02:37 +00:00
- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
2020-07-30 14:25:00 +00:00
+# INSTALL(CODE "MESSAGE(STATUS \"py compiling \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
+# INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
+# INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
+# INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
2018-03-09 23:02:37 +00:00
ENDFOREACH(input ${PYFILE2COMPINST})
ENDMACRO(INSTALL_AND_COMPILE_PYTHON_FILE PYFILE2COMPINST PYFILELOC)
2020-07-30 14:25:00 +00:00
diff -rupN --no-dereference med-4.1.0/python/CMakeLists.txt med-4.1.0-new/python/CMakeLists.txt
--- med-4.1.0/python/CMakeLists.txt 2020-01-30 17:03:53.000000000 +0100
2021-12-03 08:51:15 +00:00
+++ med-4.1.0-new/python/CMakeLists.txt 2021-12-03 09:32:31.545994485 +0100
2019-03-13 10:29:40 +00:00
@@ -36,7 +36,7 @@ SET(_link_libs
2018-03-09 23:02:37 +00:00
${PYTHON_LIBRARIES}
)
-SET(_install_dir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)
+SET(_install_dir lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)
# Ensure we will be able to run the Python tests from the build tree by outputing
# files into the package folder:
2020-07-30 14:25:00 +00:00
diff -rupN --no-dereference med-4.1.0/tools/medimport/CMakeLists.txt med-4.1.0-new/tools/medimport/CMakeLists.txt
--- med-4.1.0/tools/medimport/CMakeLists.txt 2020-03-12 16:45:46.000000000 +0100
2021-12-03 08:51:15 +00:00
+++ med-4.1.0-new/tools/medimport/CMakeLists.txt 2021-12-03 09:32:31.545994485 +0100
2020-07-30 14:25:00 +00:00
@@ -90,4 +90,4 @@ IF(NOT (WIN32 AND MEDFILE_BUILD_STATIC_L
2018-03-09 23:02:37 +00:00
INSTALL(TARGETS medimport DESTINATION bin )
ENDIF()
-INSTALL(FILES include/medimport_win_dll.h include/MEDimport.h include/MEDimport.hxx include/medimportcxx_win_dll.h DESTINATION include)
+INSTALL(FILES include/medimport_win_dll.h include/MEDimport.h include/MEDimport.hxx include/medimportcxx_win_dll.h DESTINATION ${INSTALL_INCLUDE_DIR})