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 +++ med-4.1.0-new/CMakeLists.txt 2021-12-03 09:32:31.544994485 +0100 @@ -101,9 +101,9 @@ ENDIF(WIN32) IF(WIN32 AND NOT CYGWIN) SET(INSTALL_CMAKE_CONFIG_DIR cmake) ELSE() - SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/med-fichier-${MED_STR_VERSION}) + SET(INSTALL_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/MEDFile) ENDIF() -SET(INSTALL_INCLUDE_DIR include) +SET(INSTALL_INCLUDE_DIR include/med) ## Pre-requisites detection # Detect HDF5 first to potentially retrieve MPI automatically: @@ -144,8 +144,8 @@ ENDIF() ## 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() ####################### 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 +++ med-4.1.0-new/config/cmake_files/medMacros.cmake 2021-12-03 09:32:31.545994485 +0100 @@ -505,9 +505,9 @@ MACRO(INSTALL_AND_COMPILE_PYTHON_FILE PY FOREACH(input ${PYFILE2COMPINST}) GET_FILENAME_COMPONENT(inputname ${input} NAME) INSTALL(FILES ${input} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}) - 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}\")") +# 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}\")") ENDFOREACH(input ${PYFILE2COMPINST}) ENDMACRO(INSTALL_AND_COMPILE_PYTHON_FILE PYFILE2COMPINST PYFILELOC) 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 +++ med-4.1.0-new/python/CMakeLists.txt 2021-12-03 09:32:31.545994485 +0100 @@ -36,7 +36,7 @@ SET(_link_libs ${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: 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 +++ med-4.1.0-new/tools/medimport/CMakeLists.txt 2021-12-03 09:32:31.545994485 +0100 @@ -90,4 +90,4 @@ IF(NOT (WIN32 AND MEDFILE_BUILD_STATIC_L 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})