From 35384079d12dcf3147c063cf61f6b2e48c5067b8 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Sun, 22 Dec 2019 10:04:09 +0100 Subject: [PATCH 1/2] submodule --- ChangeLog.md | 5 +++++ cmake/CheckCPP11.cmake | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 414b39094f..e94842c893 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -14,6 +14,11 @@ ## Changes +- *General* + - DGtal can be compiled and used as a project (git) submodule (David + Coeurjolly [#xx](https://github.com/DGtal-team/DGtal/pull/xxx)) + + - *DEC* - Add discrete calculus model of Ambrosio-Tortorelli functional in order to make piecewise-smooth approximations of scalar or vector diff --git a/cmake/CheckCPP11.cmake b/cmake/CheckCPP11.cmake index 29adbb325b..2d36e2c8d9 100644 --- a/cmake/CheckCPP11.cmake +++ b/cmake/CheckCPP11.cmake @@ -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 ) @@ -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 ) From 27d89a3dbb00f39b3808c428082dd4151dd564bd Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Sun, 22 Dec 2019 10:05:31 +0100 Subject: [PATCH 2/2] Changelog --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index e94842c893..413e560b5b 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -16,7 +16,7 @@ - *General* - DGtal can be compiled and used as a project (git) submodule (David - Coeurjolly [#xx](https://github.com/DGtal-team/DGtal/pull/xxx)) + Coeurjolly [#1444](https://github.com/DGtal-team/DGtal/pull/1444)) - *DEC*