Ticket #5401 (closed: fixed)

Opened 8 years ago

Last modified 5 years ago

Update HDF5 libraries and integrate into CMake

Reported by: Stuart Campbell Owned by: Stuart Campbell
Priority: major Milestone: Release 2.4
Component: Mantid Keywords:
Cc: taylorrj@…, borreguero@… Blocked By:
Blocking: #5146 Tester: Martyn Gigg

Description

  • Update the HDF5 3rd party files that we ship for Windows and Mac.
  • Update CMake to find these libraries.

For Linux we will use the system installed hdf5.

Change History

comment:1 Changed 8 years ago by Stuart Campbell

  • Cc taylorrj@…, borreguero@… added
  • Status changed from new to accepted

comment:2 Changed 8 years ago by Stuart Campbell

refs #5401. CMake settings file for Windows.

Defines where the binaries are.

Changeset: 837155f502540377c03a9d66d31c97d43f30dfa4

comment:3 Changed 8 years ago by Stuart Campbell

refs #5401. CMake HDF5 settings file for Mac OS X.

Defines where the libraries are for Mac.

Changeset: 488141316526f5c11f101aa0108bd9479f8a4995

comment:4 Changed 8 years ago by Stuart Campbell

refs #5401. CMake config file for HDF5

This will be used on Mac/Windows to find the HDF5 libs.

Changeset: b352539d96eb8136928c725aa675c7d3dfc1c57d

comment:5 Changed 8 years ago by Stuart Campbell

refs #5401. CMake HDF5 settings file for Mac OS X.

Defines where the libraries are for Mac.

Changeset: 271c3c740a8fa913836e63a12ad9a59ac0879eb4

comment:6 Changed 8 years ago by Stuart Campbell

refs #5401. CMake config file for HDF5

This will be used on Mac/Windows to find the HDF5 libs.

Changeset: 6d11b3fab8838828b0af85b9391f40ad32e835d4

comment:7 Changed 8 years ago by Stuart Campbell

refs #5401. removed debug statement

Changeset: 6ffbf268433e0b9d6089ed00d46761944fbc338d

comment:8 Changed 8 years ago by Stuart Campbell

refs #5401. Logic to find HDF5

Commented out for now.

Changeset: 4e897e4e98c3acd5aa367750f311c802e3bacebc

comment:9 Changed 8 years ago by Stuart Campbell

refs #5401. Correct typo in syntax.

Forgot the () on the ELSE statement.

Changeset: 675c6c30f2b149c71ca6f3b48fe8772bff161bfe

comment:10 Changed 8 years ago by Stuart Campbell

refs #5401. CMake settings file for Windows.

Defines where the binaries are.

Changeset: 837155f502540377c03a9d66d31c97d43f30dfa4

comment:11 Changed 8 years ago by Stuart Campbell

refs #5401. CMake HDF5 settings file for Mac OS X.

Defines where the libraries are for Mac.

Changeset: 271c3c740a8fa913836e63a12ad9a59ac0879eb4

comment:12 Changed 8 years ago by Stuart Campbell

refs #5401. CMake config file for HDF5

This will be used on Mac/Windows to find the HDF5 libs.

Changeset: 6d11b3fab8838828b0af85b9391f40ad32e835d4

comment:13 Changed 8 years ago by Stuart Campbell

refs #5401. removed debug statement

Changeset: 6ffbf268433e0b9d6089ed00d46761944fbc338d

comment:14 Changed 8 years ago by Stuart Campbell

refs #5401. Logic to find HDF5

Commented out for now.

Changeset: 4e897e4e98c3acd5aa367750f311c802e3bacebc

comment:15 Changed 8 years ago by Stuart Campbell

refs #5401. Correct typo in syntax.

Forgot the () on the ELSE statement.

Changeset: 675c6c30f2b149c71ca6f3b48fe8772bff161bfe

comment:16 Changed 8 years ago by Stuart Campbell

refs #5401. CMake settings file for Windows.

Defines where the binaries are.

Changeset: 837155f502540377c03a9d66d31c97d43f30dfa4

comment:17 Changed 8 years ago by Stuart Campbell

refs #5401. CMake HDF5 settings file for Mac OS X.

Defines where the libraries are for Mac.

Changeset: 271c3c740a8fa913836e63a12ad9a59ac0879eb4

comment:18 Changed 8 years ago by Stuart Campbell

refs #5401. CMake config file for HDF5

This will be used on Mac/Windows to find the HDF5 libs.

Changeset: 6d11b3fab8838828b0af85b9391f40ad32e835d4

comment:19 Changed 8 years ago by Stuart Campbell

refs #5401. removed debug statement

Changeset: 6ffbf268433e0b9d6089ed00d46761944fbc338d

comment:20 Changed 8 years ago by Stuart Campbell

refs #5401. Logic to find HDF5

Commented out for now.

Changeset: 4e897e4e98c3acd5aa367750f311c802e3bacebc

comment:21 Changed 8 years ago by Stuart Campbell

refs #5401. Correct typo in syntax.

Forgot the () on the ELSE statement.

Changeset: 675c6c30f2b149c71ca6f3b48fe8772bff161bfe

comment:22 Changed 8 years ago by Stuart Campbell

refs #5401. CMake HDF5 settings file for Mac OS X.

Defines where the libraries are for Mac.

Changeset: 488141316526f5c11f101aa0108bd9479f8a4995

comment:23 Changed 8 years ago by Stuart Campbell

refs #5401. CMake config file for HDF5

This will be used on Mac/Windows to find the HDF5 libs.

Changeset: b352539d96eb8136928c725aa675c7d3dfc1c57d

comment:24 Changed 8 years ago by Stuart Campbell

refs #5401. CMake HDF5 settings file for Mac OS X.

Defines where the libraries are for Mac.

Changeset: 488141316526f5c11f101aa0108bd9479f8a4995

comment:25 Changed 8 years ago by Stuart Campbell

refs #5401. CMake config file for HDF5

This will be used on Mac/Windows to find the HDF5 libs.

Changeset: b352539d96eb8136928c725aa675c7d3dfc1c57d

comment:26 Changed 8 years ago by Stuart Campbell

Still waiting for NeXus to update

comment:27 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.2 to Release 2.3

Moved at the end of release 2.2

comment:28 Changed 8 years ago by Nick Draper

  • Milestone changed from Release 2.3 to Release 2.4

moved to Release 2.4

comment:29 Changed 8 years ago by Stuart Campbell

refs #5401. Update hdf5 config for include dirs

There has been a change in the CMake variable used. It has changed from HDF5_INCLUDE_DIR to HDF5_INCLUDE_DIRS

Changeset: eaa81f7451a5072cb2e356ba919bac71987381f0

comment:30 Changed 8 years ago by Stuart Campbell

Adding HDF5 1.8.9 libraries for mac. refs #5401

Includes C, HL, C++, C++ HL APIs

Changeset: 30137e58c5634e23f8bd33c89cb4dab6088bc140

comment:31 Changed 8 years ago by Stuart Campbell

refs #5401. Updated Win64 libs for HDF5 1.8.9

Changeset: b49359e3089121e8213f7b227fcf5f73ce88e875

comment:32 Changed 8 years ago by Stuart Campbell

refs #5401. Updated win32 libs for HDF5 1.8.9

Changeset: 01987231234f856cad46a81d5a4cb0c9387da123

comment:33 Changed 8 years ago by Stuart Campbell

refs #5401. Updated Windows specific HDF5 config

Removed options for all build types but release, since we don't have the debug libs in 3rd party anyway.

Changeset: 2841ccc46ca8f522eb4e08a0dd31bc9457b411a6

comment:34 Changed 8 years ago by Stuart Campbell

refs #5401. Add compilation against HDF5 libs.

Changeset: 2a43ed27a04c80c99a0f0f3ed944df0a0d8e7f5e

comment:35 Changed 8 years ago by Stuart Campbell

refs #5401. Removing HL component reference

Removing finding the HL component explicitly as some older linux distros don't seem to include it!

Changeset: 58628456e9b30fb8601a20408b227a6626461f85

comment:36 Changed 8 years ago by Stuart Campbell

refs #5401. Remove unneeded file

Changeset: 7b9c38b9036b1135beba47ad5ce11aeb85f17c05

comment:37 Changed 8 years ago by Stuart Campbell

refs #5401. Re-enable HL component

CMake 2.8.5 or greater is required in order for this to work.

Changeset: a525326ef6c25419ae6605271434e66166833985

comment:38 Changed 8 years ago by Stuart Campbell

  • Blocking 5146 added

comment:39 Changed 8 years ago by Stuart Campbell

refs #5401 & #5146. Added LoadSassena to build

Enable LoadSassena and unit test on all platforms.

Changeset: b48c1c458cbc13199ba1b09162da1ba7a1c1751a

comment:40 Changed 8 years ago by Stuart Campbell

refs #5401. Add Win64 specific HDF5 includes

Changeset: 97f2632278052941a90e542b625aff7fbf88c986

comment:41 Changed 8 years ago by Stuart Campbell

refs #5401. Remove unused hdf5 windows header

Changeset: 787eded9846a0930cb27b6de7ba30a2c19003d4c

comment:42 Changed 8 years ago by Stuart Campbell

  • Status changed from accepted to verify
  • Resolution set to fixed

comment:43 Changed 8 years ago by Stuart Campbell

refs #5401. Update hdf5 config for include dirs

There has been a change in the CMake variable used. It has changed from HDF5_INCLUDE_DIR to HDF5_INCLUDE_DIRS

Changeset: fa1d39d5079bce2ec246fd5bdf43d5045906b2c0

comment:44 Changed 8 years ago by Stuart Campbell

refs #5401. Updated Windows specific HDF5 config

Removed options for all build types but release, since we don't have the debug libs in 3rd party anyway.

Changeset: 90ddc27a19a118094ca7ac066a848e27fae5363d

comment:45 Changed 8 years ago by Stuart Campbell

refs #5401. Add compilation against HDF5 libs.

Changeset: 5828d7489bfd63184be9a3323f90884c2f774278

comment:46 Changed 8 years ago by Stuart Campbell

refs #5401. Removing HL component reference

Removing finding the HL component explicitly as some older linux distros don't seem to include it!

Changeset: 62734ddd702430b6e4903dcaff0c88b5217af112

comment:47 Changed 8 years ago by Stuart Campbell

refs #5401. Remove unneeded file

Changeset: d57dca2c1966b73662476e1bef0c762f0da9b519

comment:48 Changed 8 years ago by Stuart Campbell

refs #5401. Re-enable HL component

CMake 2.8.5 or greater is required in order for this to work.

Changeset: f98de8d941f6912f80413716ad2868322102902f

comment:49 Changed 8 years ago by Stuart Campbell

refs #5401 & #5146. Added LoadSassena to build

Enable LoadSassena and unit test on all platforms.

Changeset: 1c85837192eace78f2fb0923a0319224ba2439f8

comment:50 Changed 8 years ago by Stuart Campbell

  • Status changed from verify to reopened
  • Resolution fixed deleted

comment:51 Changed 8 years ago by Stuart Campbell

  • Status changed from reopened to accepted

comment:52 Changed 8 years ago by Stuart Campbell

Remove version numbers from library names.

For some reason compiling HDF5 using CMake on OSX 10.6 fails. The autotools build works ok though. But it results in different library filenames. i.e. without the version number.

refs #5401

Changeset: 2cb8207f2cb9a34fa2997ffd0d56048c9103cbf1

comment:53 Changed 8 years ago by Stuart Campbell

  • Status changed from accepted to verify
  • Resolution set to fixed

comment:54 Changed 8 years ago by Stuart Campbell

Remove version numbers from library names.

For some reason compiling HDF5 using CMake on OSX 10.6 fails. The autotools build works ok though. But it results in different library filenames. i.e. without the version number.

refs #5401

Changeset: 02dbd2dac625c8b9eb1c6cb0ed09c3c2964dd450

comment:55 Changed 8 years ago by Martyn Gigg

  • Status changed from verify to verifying
  • Tester set to Martyn Gigg

comment:56 Changed 8 years ago by Martyn Gigg

  • Status changed from verifying to closed

Looks fine. Updated libraries appear where they are expected.

comment:57 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 6247

Note: See TracTickets for help on using tickets.