Merge pull request #1444 from dcoeurjo/submodule

Minor edit to allow DGtal to be used as a submodule
DGtal-team · Dec 22, 2019 · 587840e · 587840e
2 parents 2775f4f + 27d89a3
commit 587840e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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 [#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

diff --git 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
     )