1 diff -Naur med-4.1.0_SRC.orig/CMakeLists.txt med-4.1.0_SRC.new/CMakeLists.txt
2 --- med-4.1.0_SRC.orig/CMakeLists.txt 2020-03-12 18:45:46.000000000 +0300
3 +++ med-4.1.0_SRC.new/CMakeLists.txt 2021-03-19 16:07:10.097210739 +0300
5 IF(WIN32 AND NOT CYGWIN)
6 SET(INSTALL_CMAKE_CONFIG_DIR cmake)
8 - SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/med-fichier-${MED_STR_VERSION})
9 + SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/medfile-${MED_STR_VERSION})
11 SET(INSTALL_INCLUDE_DIR include)
13 diff -Naur med-4.1.0_SRC.orig/CMakeLists.txt.in med-4.1.0_SRC.new/CMakeLists.txt.in
14 --- med-4.1.0_SRC.orig/CMakeLists.txt.in 2020-03-03 16:53:39.000000000 +0300
15 +++ med-4.1.0_SRC.new/CMakeLists.txt.in 2021-03-19 16:50:43.589542683 +0300
17 IF(WIN32 AND NOT CYGWIN)
18 SET(INSTALL_CMAKE_CONFIG_DIR cmake)
20 - SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/med-fichier-${MED_STR_VERSION})
21 + SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/medfile-${MED_STR_VERSION})
23 SET(INSTALL_INCLUDE_DIR include)
25 diff -Naur med-4.1.0_SRC.orig/config/cmake_files/MEDFileConfig.cmake.in med-4.1.0_SRC.new/config/cmake_files/MEDFileConfig.cmake.in
26 --- med-4.1.0_SRC.orig/config/cmake_files/MEDFileConfig.cmake.in 2020-02-24 14:08:41.000000000 +0300
27 +++ med-4.1.0_SRC.new/config/cmake_files/MEDFileConfig.cmake.in 2021-03-19 14:26:06.733900990 +0300
29 IF(MEDFILE_BUILD_SHARED_LIBS)
30 SET(MEDFILE_C_LIBRARIES medC)
31 SET(MEDFILE_EXTRA_LIBRARIES medimportengine)
32 + SET(MEDFILE_LIBRARIES medC medfwrap med)
34 IF(MEDFILE_BUILD_STATIC_LIBS)
35 SET(MEDFILE_C_LIBRARIES medC_static)
36 SET(MEDFILE_EXTRA_LIBRARIES medimportengine_static)
37 + SET(MEDFILE_LIBRARIES medC_static med_static medfwrap_static)
39 -# For now we don't expose Fortran bindings:
40 -SET(MEDFILE_LIBRARIES ${MEDFILE_C_LIBRARIES})
43 SET_AND_CHECK(MEDFILE_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@")
44 diff -Naur med-4.1.0_SRC.orig/src/CMakeLists.txt med-4.1.0_SRC.new/src/CMakeLists.txt
45 --- med-4.1.0_SRC.orig/src/CMakeLists.txt 2020-03-12 18:45:46.000000000 +0300
46 +++ med-4.1.0_SRC.new/src/CMakeLists.txt 2021-03-19 14:21:15.342441002 +0300
50 TARGET_LINK_LIBRARIES(medfwrap medC)
51 - INSTALL(TARGETS medfwrap EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
52 + INSTALL(TARGETS medfwrap EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
54 # Add Shared MED library
55 ADD_LIBRARY(med SHARED MEDiterators.c)
57 TARGET_LINK_LIBRARIES(med medfwrap)
59 # Install only the resulting library:
60 - INSTALL(TARGETS med EXPORT medTargetsF DESTINATION lib${LIB_SUFFIX})
61 + INSTALL(TARGETS med EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
64 ######### Static Libraries ##########
66 ADD_LIBRARY(medfwrap_static STATIC ${medfort_wrap_SOURCES})
67 SET_TARGET_PROPERTIES(medfwrap_static PROPERTIES OUTPUT_NAME medfwrap)
68 TARGET_LINK_LIBRARIES(medfwrap_static medC_static)
69 - INSTALL(TARGETS medfwrap_static EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
70 + INSTALL(TARGETS medfwrap_static EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
72 # Add Static MED library
73 ADD_LIBRARY(med_static STATIC MEDiterators.c)
75 TARGET_LINK_LIBRARIES(med_static medfwrap_static)
77 # Install only the resulting library:
78 - INSTALL(TARGETS med_static EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
79 + INSTALL(TARGETS med_static EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
82 ENDIF(CMAKE_Fortran_COMPILER_WORKS)
83 diff -Naur med-4.1.0_SRC.orig/src/CMakeLists.txt.in med-4.1.0_SRC.new/src/CMakeLists.txt.in
84 --- med-4.1.0_SRC.orig/src/CMakeLists.txt.in 2019-07-03 19:09:45.000000000 +0300
85 +++ med-4.1.0_SRC.new/src/CMakeLists.txt.in 2021-03-19 16:48:53.988720349 +0300
87 SOVERSION @MED_CMAKE_SO_MAJ@
88 VERSION @MED_CMAKE_SO_MAJ@.@MED_CMAKE_SO_MIN@.@MED_CMAKE_SO_REL@)
89 TARGET_LINK_LIBRARIES(medfwrap medC)
90 - INSTALL(TARGETS medfwrap EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
91 + INSTALL(TARGETS medfwrap EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
93 # Add Shared MED library
94 ADD_LIBRARY(med SHARED MEDiterators.c)
96 TARGET_LINK_LIBRARIES(med medfwrap)
98 # Install only the resulting library:
99 - INSTALL(TARGETS med EXPORT medTargetsF DESTINATION lib${LIB_SUFFIX})
100 + INSTALL(TARGETS med EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
103 ######### Static Libraries ##########
105 ADD_LIBRARY(medfwrap_static STATIC ${medfort_wrap_SOURCES})
106 SET_TARGET_PROPERTIES(medfwrap_static PROPERTIES OUTPUT_NAME medfwrap)
107 TARGET_LINK_LIBRARIES(medfwrap_static medC_static)
108 - INSTALL(TARGETS medfwrap_static EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
109 + INSTALL(TARGETS medfwrap_static EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
111 # Add Static MED library
112 ADD_LIBRARY(med_static STATIC MEDiterators.c)
114 TARGET_LINK_LIBRARIES(med_static medfwrap_static)
116 # Install only the resulting library:
117 - INSTALL(TARGETS med_static EXPORT medfileTargetsF DESTINATION lib${LIB_SUFFIX})
118 + INSTALL(TARGETS med_static EXPORT ${_export_group} DESTINATION lib${LIB_SUFFIX})
121 ENDIF(CMAKE_Fortran_COMPILER_WORKS)