Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Backports for 0.3.1-rc4 #2304

Merged
merged 6 commits into from
Oct 11, 2017
Merged

Backports for 0.3.1-rc4 #2304

merged 6 commits into from
Oct 11, 2017

Conversation

ax3l
Copy link
Member

@ax3l ax3l commented Oct 11, 2017 •
edited
Loading

Backports for 0.3.1-rc4:

Note:

  • compile suite has changed, manual compile test on hypnos was successful
        # Core Dependencies
        module load gcc/4.9.2
        module load cmake/3.3.0
        module load boost/1.62.0
        module load cuda/7.5
        module load openmpi/1.8.6.kepler.cuda75

        # Plugins (optional)
        module load pngwriter/0.5.6

        # HDF5 & Splash
        module load hdf5-parallel/1.8.15
        export SPLASH_ROOT=$HOME/lib/libSplash-1.6.0-cuda75
        export LD_LIBRARY_PATH=$SPLASH_ROOT/lib:$LD_LIBRARY_PATH

Tools and others added 6 commits October 11, 2017 10:00
@ax3l
Bump Version: 0.3.1-rc4
da397ab
@ax3l
CMake: Forgotten Line in Backport Zlib
2db1284 
Remove superfluous line in Zlib target backport of ComputationalRadiationPhysics#2216
@ax3l
tbg: quick-fix for screen
4db0663 
quick fix for 2261: ignore the TERMCAP variable.
@ax3l
tbg env: general fix
2b9f8f5 
replace the three special chars
- /
- \
- &

with proper escaping in environment vars before parsing.

Found from
  https://stackoverflow.com/a/2705678/2719194
plus two extra `\\` for ... reasons.
@ax3l
CMake: Boost Target Check
a6bacb0 
It turns out, the `Boost::boost` target for the header only
libraries is always available, even if the other targets are
not, e.g. due to a newer boost version which leads to a
`_Boost_IMPORTED_TARGETS FALSE`.

This fixes the detection properly in such a case by testing for
the first (or any) of the oder requested targets instead.
@ax3l
CMake: Same Boost Min for Tools
034f2e2 
Introduce the same minimal boost version as a requirement for tools
as we use for the main project.

Helps a little to avoid picking up parallel installs of (system)
boost versions, which are usually older.
@ax3l ax3l added affects latest release a bug that affects the latest stable release bug a bug in the project's code component: tools scripts, python libs and CMake labels Oct 11, 2017
PrometheusPi
PrometheusPi approved these changes Oct 11, 2017
View reviewed changes
Copy link
Member

@PrometheusPi PrometheusPi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me

@psychocoderHPC psychocoderHPC merged commit 211de7f into ComputationalRadiationPhysics:release-0.3.1 Oct 11, 2017
@ax3l ax3l deleted the release-0.3.1-rc4 branch October 11, 2017 09:26
@ax3l ax3l mentioned this pull request Oct 11, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PrometheusPi PrometheusPi PrometheusPi approved these changes

@psychocoderHPC psychocoderHPC psychocoderHPC approved these changes

Assignees

@psychocoderHPC psychocoderHPC

Labels
affects latest release a bug that affects the latest stable release bug a bug in the project's code component: tools scripts, python libs and CMake
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ax3l @psychocoderHPC @PrometheusPi