From 0aa2ec1fad8942e11e5add6262def9115f3211b5 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 3 May 2022 15:30:09 +0200 Subject: [PATCH 1/2] Allow for static compilation of the modules --- CMakeLists.txt | 6 ++++++ vespa/Delaunay/CMakeLists.txt | 1 + vespa/PolygonMeshProcessing/CMakeLists.txt | 1 + 3 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45b9965..eb6b4c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,12 @@ else() endif() ## VTK Module +option(FORCE_STATIC_MODULES "Build VTK modules statically" OFF) +if (FORCE_STATIC_MODULES) + set(FORCE_STATIC_MODULES_STRING FORCE_STATIC) +else () + set(FORCE_STATIC_MODULES_STRING) +endif() vtk_module_find_modules(vtkcgal_module_files "${CMAKE_CURRENT_SOURCE_DIR}/vespa") diff --git a/vespa/Delaunay/CMakeLists.txt b/vespa/Delaunay/CMakeLists.txt index 689690e..2c9c0c1 100644 --- a/vespa/Delaunay/CMakeLists.txt +++ b/vespa/Delaunay/CMakeLists.txt @@ -2,5 +2,6 @@ set(vtkcgaldelaunay_files vtkCGALDelaunay2 ) vtk_module_add_module(vtkCGALDelaunay + ${FORCE_STATIC_MODULES_STRING} CLASSES ${vtkcgaldelaunay_files} ) diff --git a/vespa/PolygonMeshProcessing/CMakeLists.txt b/vespa/PolygonMeshProcessing/CMakeLists.txt index 3af4d1f..4305d37 100644 --- a/vespa/PolygonMeshProcessing/CMakeLists.txt +++ b/vespa/PolygonMeshProcessing/CMakeLists.txt @@ -10,5 +10,6 @@ set(vtkcgalpmp_files vtkCGALShapeSmoothing ) vtk_module_add_module(vtkCGALPMP + ${FORCE_STATIC_MODULES_STRING} CLASSES ${vtkcgalpmp_files} ) -- GitLab From d811b6a9605ac33466dffefeb21add5ee7626d2e Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Wed, 4 May 2022 08:00:45 +0200 Subject: [PATCH 2/2] advanced option --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb6b4c8..0bc549d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,7 @@ endif() ## VTK Module option(FORCE_STATIC_MODULES "Build VTK modules statically" OFF) +mark_as_advanced(FORCE_STATIC_MODULES) if (FORCE_STATIC_MODULES) set(FORCE_STATIC_MODULES_STRING FORCE_STATIC) else () -- GitLab