Salome HOME
Finalize OCCT patches
[tools/configuration.git] / config / patches / occt / med.001.bug_correct_cmake.patch
1 diff -Naur --exclude=CVS --exclude=.git med-4.0.0rc1.orig/CMakeLists.txt med-4.0.0rc1.patched/CMakeLists.txt
2 --- med-4.0.0rc1.orig/CMakeLists.txt    2018-10-24 18:38:31.000000000 +0300
3 +++ med-4.0.0rc1.patched/CMakeLists.txt 2018-10-30 18:57:34.000000000 +0300
4 @@ -121,7 +121,8 @@
5  
6  ## Installation of the doc
7  IF(MEDFILE_INSTALL_DOC)
8 -  INSTALL(DIRECTORY doc DESTINATION ${CMAKE_INSTALL_PREFIX}/share)
9 +  INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE)
10 +  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")
11  ENDIF()
12  
13  #######################
14 diff -Naur --exclude=CVS --exclude=.git med-4.0.0rc1.orig/config/cmake_files/medMacros.cmake med-4.0.0rc1.patched/config/cmake_files/medMacros.cmake
15 --- med-4.0.0rc1.orig/config/cmake_files/medMacros.cmake        2018-10-22 11:36:07.000000000 +0300
16 +++ med-4.0.0rc1.patched/config/cmake_files/medMacros.cmake     2018-10-30 19:03:44.673012496 +0300
17 @@ -406,7 +406,7 @@
18  
19      ADD_DEFINITIONS(-DH5_USE_16_API)  
20      IF(WIN32 AND MEDFILE_BUILD_SHARED_LIBS)
21 -      ADD_DEFINITIONS(-D_HDF5USEDLL_)  
22 +      ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1)   
23      ENDIF()
24      
25      # Take what is exposed by the standard FIND_PACKAGE()
26 diff -Naur --exclude=CVS --exclude=.git med-4.0.0rc1.orig/python/CMakeLists.txt med-4.0.0rc1.patched/python/CMakeLists.txt
27 --- med-4.0.0rc1.orig/python/CMakeLists.txt     2018-10-23 01:43:04.000000000 +0300
28 +++ med-4.0.0rc1.patched/python/CMakeLists.txt  2018-10-30 19:03:44.657012959 +0300
29 @@ -24,7 +24,7 @@
30    medparameter_module.i
31    medprofile_module.i
32    medsubdomain_module.i
33 -  medstructelement.i
34 +  medstructelement_module.i
35  )
36  
37  IF(APPLE)