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.

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

Vendor Catch2: v2.5.0 #718

Merged
merged 3 commits into from
Jan 3, 2019
Merged

Conversation

ax3l
Copy link
Member

@ax3l ax3l commented Jan 2, 2019

Add a third-party header for a vendored catch2 for our tests.

Source: https://github.com/catchorg/Catch2/releases
Version: 0.2.5

New CMake Option

By default, we will build the tests with the internally vendored Catch2 in order to make testing easy. If you want to force using an external Catch2 install (expand your CMAKE_PREFIX_PATH with its location), then set: -DALPAKA_USE_INTERNAL_CATCH2=OFF

@ax3l ax3l requested a review from BenjaminW3 January 2, 2019 11:02
@ax3l ax3l mentioned this pull request Jan 2, 2019
3 tasks
@ax3l ax3l force-pushed the topic-vendorCatch2 branch 3 times, most recently from 6c6d269 to 4ed7d81 Compare January 2, 2019 12:02
@BenjaminW3
Copy link
Member

BenjaminW3 commented Jan 3, 2019

The changes hit a known bug in gcc-5.5:

It works with gcc-5.4, gcc-4.9 or gcc-6 and also when building with nvcc 10.0. It previously worked because we had been building debug builds only but not release.

Could you please revert the changes in before_install.sh so that this can be merged and create a bug ticket to resolve the nvcc-9+gcc-5.5+release issue?

test/CMakeLists.txt Outdated Show resolved Hide resolved
ax3l and others added 3 commits January 3, 2019 09:50
Use the vendored Catch2 in Alpaka instead of installing an
external one.
Add the single-header release of Catch 2.5.0 to a third party
library for tests.
@BenjaminW3 BenjaminW3 merged commit 27a7e11 into alpaka-group:develop Jan 3, 2019
@ax3l ax3l deleted the topic-vendorCatch2 branch January 3, 2019 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants