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

Minor edit to allow DGtal to be used as a submodule #1444

Merged
merged 2 commits into from
Dec 22, 2019
Merged

Minor edit to allow DGtal to be used as a submodule #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d484e0
submodule
dcoeurjo Dec 22, 2019
edee37c
Changelog
dcoeurjo Dec 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@

## Changes

- *General*
- DGtal can be compiled and used as a project (git) submodule (David
Coeurjolly [#1444](https://github.com/DGtal-team/DGtal/pull/1444))


- *DEC*
- Add discrete calculus model of Ambrosio-Tortorelli functional in
order to make piecewise-smooth approximations of scalar or vector
Expand Down
8 changes: 4 additions & 4 deletions cmake/CheckCPP11.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# -----------------------------------------------------------------------------

try_compile( CPP11_COMPATIBLE_FLAG_SET_BY_USER
${CMAKE_BINARY_DIR}/CMakeTmp
${CMAKE_SOURCE_DIR}/cmake/src/cpp11/cpp11_check.cpp
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp
${CMAKE_CURRENT_SOURCE_DIR}/cmake/src/cpp11/cpp11_check.cpp
CMAKE_FLAGS "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
OUTPUT_VARIABLE OUTPUT
)
Expand All @@ -15,8 +15,8 @@ ENDIF()

IF (NOT CPP11_COMPATIBLE_FLAG_SET_BY_USER)
try_compile( CPP11_COMPATIBLE_FLAG_SET_BY_DGTAL
${CMAKE_BINARY_DIR}/CMakeTmp
${CMAKE_SOURCE_DIR}/cmake/src/cpp11/cpp11_check.cpp
${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp
${CMAKE_CURRENT_SOURCE_DIR}/cmake/src/cpp11/cpp11_check.cpp
COMPILE_DEFINITIONS "-std=c++11"
OUTPUT_VARIABLE OUTPUT
)
Expand Down