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

Removing old catch.hpp snapshot, Fixing DGtal on Apple M1 #1590

Merged
merged 4 commits into from Jul 30, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion ChangeLog.md
Expand Up @@ -20,7 +20,9 @@
(David Coeurjolly, [#1578](https://github.com/DGtal-team/DGtal/pull/1578))
- Various warnings / deprecated functions (David Coeurjolly,
[#1583](https://github.com/DGtal-team/DGtal/pull/1583)

- Removing old snapshot of catch.hpp. Now DGtal compiles on Apple M1 (David Coeurjolly,
[#1590](https://github.com/DGtal-team/DGtal/pull/1590)


# DGtal 1.2

Expand Down
2 changes: 2 additions & 0 deletions examples/doc-examples/CMakeLists.txt
Expand Up @@ -5,6 +5,8 @@ set(DGTAL_DOC_EX_SRC
labelledMapBestParameters
)

# # Make sure the compiler can find include files.
dcoeurjo marked this conversation as resolved.
Show resolved Hide resolved
# include_directories (${PROJECT_SOURCE_DIR}/tests/)
dcoeurjo marked this conversation as resolved.
Show resolved Hide resolved
dcoeurjo marked this conversation as resolved.
Show resolved Hide resolved

if (BUILD_TESTING)
add_executable(exampleCatch exampleCatch.cpp)
Expand Down
10 changes: 0 additions & 10 deletions examples/doc-examples/DGtalCatch.h

This file was deleted.