From 59ebef1059d16a67439276cb31f24975f5228dee Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Mon, 20 Nov 2023 14:36:33 +0100 Subject: [PATCH 1/2] ModuleSRC fix --- CMakeLists.txt | 1 - ChangeLog.md | 2 ++ src/DGtal/helpers/ModuleSRC.cmake | 2 +- src/DGtal/kernel/ModuleSRC.cmake | 6 ------ 4 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 src/DGtal/kernel/ModuleSRC.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index fc95b2d15e..5c77537d81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,6 @@ message(STATUS "Done.") # each subdir can contain a ModuleSRC.txt file # with a set command on the variable ${DGTAL_SRC} # -include(src/DGtal/kernel/ModuleSRC.cmake) include(src/DGtal/base/ModuleSRC.cmake) include(src/DGtal/io/ModuleSRC.cmake) include(src/DGtal/helpers/ModuleSRC.cmake) diff --git a/ChangeLog.md b/ChangeLog.md index bccfa0acff..18f3a9aca2 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -63,6 +63,8 @@ [#1691](https://github.com/DGtal-team/DGtal/pull/1691)) - Cleanup of cmake targets when BUILD_TESTING is disabled (David Coeurjolly [#1698](https://github.com/DGtal-team/DGtal/pull/1698)) + - Cleaning up unnecessary ModuleSRC.cmake files (David Coeurjolly + [#16xx](https://github.com/DGtal-team/DGtal/pull/16xx)) - *Topology package* - Fix KhalimskySpaceND to get it work with BigInteger (Tristan Roussillon, diff --git a/src/DGtal/helpers/ModuleSRC.cmake b/src/DGtal/helpers/ModuleSRC.cmake index b1cd135e68..8b28c42009 100644 --- a/src/DGtal/helpers/ModuleSRC.cmake +++ b/src/DGtal/helpers/ModuleSRC.cmake @@ -1,4 +1,4 @@ set(DGTAL_SRC ${DGTAL_SRC} - DGtal/helpers/StdDefs) + DGtal/helpers/StdDefs.cpp) diff --git a/src/DGtal/kernel/ModuleSRC.cmake b/src/DGtal/kernel/ModuleSRC.cmake deleted file mode 100644 index 2e70473771..0000000000 --- a/src/DGtal/kernel/ModuleSRC.cmake +++ /dev/null @@ -1,6 +0,0 @@ -## Sources associated to the module kernel -## - -set(DGTAL_SRC ${DGTAL_SRC} - DGtal/kernel/NumberTraits) - From 00a0fa1109ff1c9c784d07121a1f9c2fc1fc0a7c Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Mon, 20 Nov 2023 14:37:42 +0100 Subject: [PATCH 2/2] ModuleSRC fix --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 18f3a9aca2..5edf8897bc 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -64,7 +64,7 @@ - Cleanup of cmake targets when BUILD_TESTING is disabled (David Coeurjolly [#1698](https://github.com/DGtal-team/DGtal/pull/1698)) - Cleaning up unnecessary ModuleSRC.cmake files (David Coeurjolly - [#16xx](https://github.com/DGtal-team/DGtal/pull/16xx)) + [#1711](https://github.com/DGtal-team/DGtal/pull/1711)) - *Topology package* - Fix KhalimskySpaceND to get it work with BigInteger (Tristan Roussillon,