-
Notifications
You must be signed in to change notification settings - Fork 21
Adding logic for hdf5 library #166
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ipdemes
wants to merge
9
commits into
master
Choose a base branch
from
irina-hdf5
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
de52b74
Adding the hdf5 support
10d9937
Merge remote-tracking branch 'origin/master' into irina-hdf5
fb784ad
temporary fix for HDF5 not finding hdf5_cxx_libraries
abd03b8
Merge remote-tracking branch 'origin/master' into irina-hdf5
6545b42
Merge remote-tracking branch 'origin/master' into irina-hdf5
8e07ba9
Merge branch 'master' into irina-hdf5
763629a
Merge branch 'master' into irina-hdf5
1437def
Merge branch 'master' into irina-hdf5
ktsai7 3972240
Merge branch 'master' into irina-hdf5
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| #------------------------------------------------------------------------------# | ||
| # Copyright (c) 2014 Los Alamos National Security, LLC | ||
| # All rights reserved. | ||
| #------------------------------------------------------------------------------# | ||
|
|
||
| #------------------------------------------------------------------------------# | ||
| # Add HDF5 support. | ||
| #------------------------------------------------------------------------------# | ||
|
|
||
| option(ENABLE_HDF5 "Enable HDF5" OFF) | ||
|
|
||
| if(ENABLE_HDF5) | ||
|
|
||
| find_package(HDF5 REQUIRED) | ||
|
|
||
| if(NOT HDF5_FOUND) | ||
| message(FATAL_ERROR "HDF5 is required for this build configuration") | ||
| endif(NOT HDF5_FOUND) | ||
|
|
||
| set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${HDF5_LIBRARY_DIRS}) | ||
|
|
||
| include_directories(${HDF5_INCLUDE_DIRS}) | ||
|
|
||
| list(APPEND CINCH_RUNTIME_LIBRARIES ${HDF5_LIBRARIES} ${HDF5_CXX_LIBRARIES}) | ||
|
|
||
| if(EXISTS "${HDF5_INCLUDE_DIRS}/../lib/libhdf5_cpp_debug.so") | ||
| list(APPEND CINCH_RUNTIME_LIBRARIES ${HDF5_INCLUDE_DIRS}/../lib/libhdf5_cpp_debug.so ) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That seems a bit hackish to me! |
||
| endif() | ||
|
|
||
| if(EXISTS "${HDF5_INCLUDE_DIRS}/../lib/libhdf5_cpp.so") | ||
| list(APPEND CINCH_RUNTIME_LIBRARIES ${HDF5_INCLUDE_DIRS}/../lib/libhdf5_cpp.so ) | ||
| endif() | ||
|
|
||
| message(STATUS "HDF5 found: ${HDF5_FOUND}") | ||
|
|
||
| endif(ENABLE_HDF5) | ||
|
|
||
| #------------------------------------------------------------------------------# | ||
| # Formatting options for emacs and vim. | ||
| # vim: set tabstop=4 shiftwidth=4 expandtab : | ||
| #------------------------------------------------------------------------------# | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm being pedantic, but this should probably be changed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@cmsquared: agree. I'll fix it in few minutes