From 9b056f3a726b256b6cb7939d6ef9fe9a232d5b36 Mon Sep 17 00:00:00 2001 From: Raphael Lenain Date: Wed, 3 Apr 2019 14:27:00 +0200 Subject: [PATCH 1/3] Fixing Visual Studio (MSVC) compilation --- estimators/CMakeLists.txt | 3 +++ estimators/volSurfaceRegularization.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/estimators/CMakeLists.txt b/estimators/CMakeLists.txt index 9c25a6c3..0985579a 100644 --- a/estimators/CMakeLists.txt +++ b/estimators/CMakeLists.txt @@ -37,6 +37,9 @@ if ( WITH_CGAL ) endif ( WITH_CGAL ) FOREACH(FILE ${DGTAL_TOOLS_SRC}) + if(MSVC) + set_source_files_properties( ${FILE} PROPERTIES COMPILE_FLAGS "/bigobj" ) + endif(MSVC) add_executable(${FILE} ${FILE}) target_link_libraries (${FILE} ${DGTAL_LIBRARIES} ${DGtalToolsLibDependencies}) install(TARGETS ${FILE} diff --git a/estimators/volSurfaceRegularization.cpp b/estimators/volSurfaceRegularization.cpp index a723f0e5..caf854be 100644 --- a/estimators/volSurfaceRegularization.cpp +++ b/estimators/volSurfaceRegularization.cpp @@ -90,6 +90,9 @@ Surface approximation options: #include #include #include +#include +#include +#include #include #include #include From 5d4a799f8fc013e5bdff57dc67fe968acd5bb4b7 Mon Sep 17 00:00:00 2001 From: Raphael Lenain Date: Wed, 3 Apr 2019 15:11:05 +0200 Subject: [PATCH 2/3] Adding PR in ChangeLog --- ChangeLog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 06ac122a..b298df68 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -13,6 +13,9 @@ - Fix Documentation nightly update on github website. (Bertrand Kerautret [#348](https://github.com/DGtal-team/DGtalTools/pull/347)) + - Fix compilation and execution with Visual Studio + (Raphael Lenain + [#353](https://github.com/DGtal-team/DGtalTools/pull/353)) - *volumetric* - New tool to fill the interior of a voxel set (volFillInterior). From 19320d6a26b42df8bf7fb5e78ba53744fa352e13 Mon Sep 17 00:00:00 2001 From: Bertrand Kerautret Date: Wed, 3 Apr 2019 16:41:18 +0200 Subject: [PATCH 3/3] Update ChangeLog.md --- ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index b298df68..affe2e04 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -13,7 +13,7 @@ - Fix Documentation nightly update on github website. (Bertrand Kerautret [#348](https://github.com/DGtal-team/DGtalTools/pull/347)) - - Fix compilation and execution with Visual Studio + - Fix compilation and execution with Visual Studio for volSurfaceRegularization. (Raphael Lenain [#353](https://github.com/DGtal-team/DGtalTools/pull/353))