Вы не можете выбрать более 25 тем Темы должны начинаться с буквы или цифры, могут содержать дефисы(-) и должны содержать не более 35 символов.

119 строки
6.1 KiB

  1. diff -rupN hdf5-1.8.8/CMakeLists.txt hdf5-1.8.8.cotire/CMakeLists.txt
  2. --- hdf5-1.8.8/CMakeLists.txt 2011-11-07 23:11:41.000000000 +0100
  3. +++ hdf5-1.8.8.cotire/CMakeLists.txt 2012-03-24 17:30:29.000000000 +0100
  4. @@ -200,6 +200,7 @@ SET (HDF5_PACKAGE_BUGREPORT "help@hdfgro
  5. #-----------------------------------------------------------------------------
  6. INCLUDE (${HDF5_RESOURCES_DIR}/HDFMacros.cmake)
  7. INCLUDE (${HDF5_RESOURCES_DIR}/HDF5Macros.cmake)
  8. +INCLUDE (${HDF5_RESOURCES_DIR}/cotire.cmake)
  9. #-----------------------------------------------------------------------------
  10. # Setup output Directories
  11. diff -rupN hdf5-1.8.8/c++/src/CMakeLists.txt hdf5-1.8.8.cotire/c++/src/CMakeLists.txt
  12. --- hdf5-1.8.8/c++/src/CMakeLists.txt 2011-11-07 23:11:40.000000000 +0100
  13. +++ hdf5-1.8.8.cotire/c++/src/CMakeLists.txt 2012-03-24 17:29:43.000000000 +0100
  14. @@ -85,6 +85,9 @@ ADD_LIBRARY (${HDF5_CPP_LIB_TARGET} ${LI
  15. TARGET_LINK_LIBRARIES (${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
  16. SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_TARGET}")
  17. H5_SET_LIB_OPTIONS (${HDF5_CPP_LIB_TARGET} ${HDF5_CPP_LIB_NAME} ${LIB_TYPE})
  18. +if (COMMAND cotire)
  19. +cotire(${HDF5_CPP_LIB_TARGET})
  20. +endif()
  21. #-----------------------------------------------------------------------------
  22. # Add file(s) to CMake Install
  23. diff -rupN hdf5-1.8.8/fortran/src/CMakeLists.txt hdf5-1.8.8.cotire/fortran/src/CMakeLists.txt
  24. --- hdf5-1.8.8/fortran/src/CMakeLists.txt 2011-11-07 23:11:41.000000000 +0100
  25. +++ hdf5-1.8.8.cotire/fortran/src/CMakeLists.txt 2012-03-24 17:30:02.000000000 +0100
  26. @@ -118,6 +118,9 @@ ADD_LIBRARY (${HDF5_F90_C_LIB_TARGET} ${
  27. TARGET_LINK_LIBRARIES (${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET})
  28. SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}")
  29. H5_SET_LIB_OPTIONS (${HDF5_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_NAME} ${LIB_TYPE})
  30. +if (COMMAND cotire)
  31. +cotire(${HDF5_F90_C_LIB_TARGET})
  32. +endif()
  33. #-----------------------------------------------------------------------------
  34. # Fortran 2003 standard
  35. @@ -221,6 +224,7 @@ SET_TARGET_PROPERTIES (${HDF5_F90_LIB_TA
  36. TARGET_LINK_LIBRARIES (${HDF5_F90_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET})
  37. SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_LIB_TARGET}")
  38. H5_SET_LIB_OPTIONS (${HDF5_F90_LIB_TARGET} ${HDF5_F90_LIB_NAME} ${LIB_TYPE})
  39. +cotire(${HDF5_F90_LIB_TARGET})
  40. #-----------------------------------------------------------------------------
  41. # Add file(s) to CMake Install
  42. diff -rupN hdf5-1.8.8/hl/c++/src/CMakeLists.txt hdf5-1.8.8.cotire/hl/c++/src/CMakeLists.txt
  43. --- hdf5-1.8.8/hl/c++/src/CMakeLists.txt 2011-11-07 23:11:39.000000000 +0100
  44. +++ hdf5-1.8.8.cotire/hl/c++/src/CMakeLists.txt 2012-03-24 17:29:52.000000000 +0100
  45. @@ -18,6 +18,9 @@ TARGET_LINK_LIBRARIES (
  46. )
  47. SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIB_TARGET}")
  48. H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_HL_CPP_LIB_NAME} ${LIB_TYPE})
  49. +if (COMMAND cotire)
  50. +cotire(${HDF5_HL_CPP_LIB_TARGET})
  51. +endif()
  52. #-----------------------------------------------------------------------------
  53. # Add file(s) to CMake Install
  54. diff -rupN hdf5-1.8.8/hl/src/CMakeLists.txt hdf5-1.8.8.cotire/hl/src/CMakeLists.txt
  55. --- hdf5-1.8.8/hl/src/CMakeLists.txt 2011-11-07 23:11:38.000000000 +0100
  56. +++ hdf5-1.8.8.cotire/hl/src/CMakeLists.txt 2012-03-24 17:30:11.000000000 +0100
  57. @@ -37,6 +37,9 @@ ADD_LIBRARY (${HDF5_HL_LIB_TARGET} ${LIB
  58. TARGET_LINK_LIBRARIES (${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
  59. SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_LIB_TARGET}")
  60. H5_SET_LIB_OPTIONS (${HDF5_HL_LIB_TARGET} ${HDF5_HL_LIB_NAME} ${LIB_TYPE})
  61. +if (COMMAND cotire)
  62. +cotire(${HDF5_HL_LIB_TARGET})
  63. +endif()
  64. #-----------------------------------------------------------------------------
  65. # Add file(s) to CMake Install
  66. diff -rupN hdf5-1.8.8/src/CMakeLists.txt hdf5-1.8.8.cotire/src/CMakeLists.txt
  67. --- hdf5-1.8.8/src/CMakeLists.txt 2011-11-07 23:11:30.000000000 +0100
  68. +++ hdf5-1.8.8.cotire/src/CMakeLists.txt 2012-03-24 17:29:26.000000000 +0100
  69. @@ -631,6 +631,16 @@ ADD_LIBRARY (${HDF5_LIB_TARGET} ${LIB_TY
  70. TARGET_LINK_LIBRARIES (${HDF5_LIB_TARGET} ${LINK_LIBS})
  71. SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET})
  72. H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} ${LIB_TYPE})
  73. +#set_target_properties(${HDF5_LIB_TARGET} PROPERTIES COTIRE_IGNORED_INCLUDE_DIRECTORIES "/Developer/usr;/usr/llvm-gcc-4.2;${CMAKE_SOURCE_DIR};${CMAKE_BINARY_DIR}")
  74. +
  75. +if (COMMAND cotire)
  76. +SET_SOURCE_FILES_PROPERTIES (
  77. +"${HDF5_BINARY_DIR}/H5overflow.h"
  78. +"${HDF5_BINARY_DIR}/H5version.h"
  79. +"${HDF5_BINARY_DIR}/H5Edefin.h"
  80. +PROPERTIES COTIRE_DEPENDENCY FALSE)
  81. +cotire(${HDF5_LIB_TARGET})
  82. +endif()
  83. #-----------------------------------------------------------------------------
  84. # Add file(s) to CMake Install
  85. Binary files hdf5-1.8.8/src/H5public.h.gch and hdf5-1.8.8.cotire/src/H5public.h.gch differ
  86. diff -rupN hdf5-1.8.8/test/CMakeLists.txt hdf5-1.8.8.cotire/test/CMakeLists.txt
  87. --- hdf5-1.8.8/test/CMakeLists.txt 2011-11-07 23:11:23.000000000 +0100
  88. +++ hdf5-1.8.8.cotire/test/CMakeLists.txt 2012-03-24 17:30:22.000000000 +0100
  89. @@ -30,6 +30,9 @@ IF (MINGW)
  90. ENDIF (MINGW)
  91. TARGET_LINK_LIBRARIES (${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
  92. H5_SET_LIB_OPTIONS (${HDF5_TEST_LIB_TARGET} ${HDF5_TEST_LIB_NAME} ${LIB_TYPE})
  93. +if (COMMAND cotire)
  94. +cotire(${HDF5_TEST_LIB_TARGET})
  95. +endif()
  96. # --------------------------------------------------------------------
  97. # Copy all the HDF5 files from the test directory into the source directory
  98. diff -rupN hdf5-1.8.8/tools/lib/CMakeLists.txt hdf5-1.8.8.cotire/tools/lib/CMakeLists.txt
  99. --- hdf5-1.8.8/tools/lib/CMakeLists.txt 2011-11-07 23:11:35.000000000 +0100
  100. +++ hdf5-1.8.8.cotire/tools/lib/CMakeLists.txt 2012-03-24 17:28:41.000000000 +0100
  101. @@ -40,6 +40,9 @@ H5_SET_LIB_OPTIONS (
  102. HDF5_TOOLS_LIB_NAME_RELEASE
  103. HDF5_TOOLS_LIB_NAME_DEBUG
  104. )
  105. +if (COMMAND cotire)
  106. +cotire(${HDF5_TOOLS_LIB_TARGET})
  107. +endif()
  108. ##############################################################################
  109. ##############################################################################