Package-Project Fixes, VTK-Environment refactor (#104)

* refactor: expose `setup_vtk_env`, use generator expressions, fix folder name casing * fix: formatting * fix(vtk): use proper target * chore(vtk): add note * refactor(tests, examples): remove superfluous command * fix(python): vtk environment
ViennaTools · Mar 11, 2024 · 5ad1bbd · 5ad1bbd
1 parent c3a6bb4
commit 5ad1bbd
Show file tree

Hide file tree

Showing 111 changed files with 27 additions and 82 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -77,14 +77,15 @@ endif()
 # --------------------------------------------------------------------------------------------------------
 
 target_include_directories(
-  ${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/viennals>
+  ${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/viennals>
                             $<INSTALL_INTERFACE:include/viennals-${PROJECT_VERSION}>)
 
 # --------------------------------------------------------------------------------------------------------
 # Setup Dependencies
 # --------------------------------------------------------------------------------------------------------
 
 include("cmake/cpm.cmake")
+include("cmake/vtk.cmake")
 
 CPMAddPackage(
   NAME PackageProject
@@ -101,6 +102,10 @@ target_link_libraries(${PROJECT_NAME} INTERFACE OpenMP::OpenMP_CXX ViennaHRLE)
 
 if(VIENNALS_USE_VTK)
   enable_language(C)
+
+  find_package(VTK QUIET)
+  set(VIENNALS_SYSTEM_VTK ${VTK_FOUND})
+
   CPMFindPackage(
     NAME VTK
     # TODO: Change to 9.3.1 as soon as it's released
@@ -151,12 +156,6 @@ if(VIENNALS_USE_VTK)
               VTK::FiltersCore
               VTK::FiltersGeneral
               VTK::FiltersGeometry)
-
-  if(MSVC)
-    set(VTK_LIBS "${VTK_BINARY_DIR}/bin/$<CONFIG>")
-  else()
-    set(VTK_LIBS "${VTK_BINARY_DIR}/lib")
-  endif()
 endif()
 
 # --------------------------------------------------------------------------------------------------------
@@ -184,7 +183,7 @@ endif()
 
 if(VIENNALS_BUILD_EXAMPLES)
   message(STATUS "[ViennaLS] Building Examples")
-  add_subdirectory(Examples)
+  add_subdirectory(examples)
 endif()
 
 # --------------------------------------------------------------------------------------------------------
@@ -195,7 +194,7 @@ if(VIENNALS_BUILD_TESTS)
   message(STATUS "[ViennaLS] Building Tests")
 
   enable_testing()
-  add_subdirectory(Tests)
+  add_subdirectory(tests)
 endif()
 
 # --------------------------------------------------------------------------------------------------------
@@ -204,7 +203,7 @@ endif()
 
 if(VIENNALS_BUILD_PYTHON)
   message(STATUS "[ViennaLS] Building Python Bindings")
-  add_subdirectory(Python)
+  add_subdirectory(python)
 endif()
 
 # --------------------------------------------------------------------------------------------------------

diff --git a/cmake/vtk.cmake b/cmake/vtk.cmake
@@ -1,14 +1,12 @@
 macro(setup_vtk_env TARGET OUTPUT)
-  if(NOT WIN32)
-    message(
-      STATUS "[ViennaLS] Skipping VTK-Environment setup for ${TARGET} (Only required on Windows)")
-  else()
-    message(STATUS "[ViennaLS] Setting up VTK for ${TARGET}")
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/${OUTPUT}>)
+  message(STATUS "[ViennaLS] Setting up VTK-Environment for ${TARGET}")
 
-    add_custom_command(
-      TARGET ${TARGET}
-      POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${VTK_LIBS} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-  endif()
+  # We expect all of the VTK binaries to be present in the same directory to which "vtksys" is
+  # built. This is currently the case, and has been the case for prior vtk versions - However we
+  # should keep an eye on this.
+
+  add_custom_command(
+    TARGET ${TARGET}
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory $<TARGET_FILE_DIR:vtksys> ${OUTPUT})
 endmacro()
diff --git a/...les/AirGapDeposition/AirGapDeposition.cpp → ...les/AirGapDeposition/AirGapDeposition.cpp b/...les/AirGapDeposition/AirGapDeposition.cpp → ...les/AirGapDeposition/AirGapDeposition.cpp
diff --git a/...ples/AirGapDeposition/AirGapDeposition.py → ...ples/AirGapDeposition/AirGapDeposition.py b/...ples/AirGapDeposition/AirGapDeposition.py → ...ples/AirGapDeposition/AirGapDeposition.py
diff --git a/Examples/AirGapDeposition/CMakeLists.txt → examples/AirGapDeposition/CMakeLists.txt b/Examples/AirGapDeposition/CMakeLists.txt → examples/AirGapDeposition/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(AirGapDeposition LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Examples/CMakeLists.txt → examples/CMakeLists.txt b/Examples/CMakeLists.txt → examples/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_custom_target(ViennaLS_Examples ALL)
 
-if(NOT VTK_DIR)
-  include("../cmake/vtk.cmake")
-  setup_vtk_env(ViennaLS_Examples "examples")
+if(WIN32 AND NOT VIENNALS_SYSTEM_VTK)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/examples>)
+  setup_vtk_env(ViennaLS_Examples ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()
 
 file(

diff --git a/Examples/Deposition/CMakeLists.txt → examples/Deposition/CMakeLists.txt b/Examples/Deposition/CMakeLists.txt → examples/Deposition/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(Deposition LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Examples/Deposition/Deposition.cpp → examples/Deposition/Deposition.cpp b/Examples/Deposition/Deposition.cpp → examples/Deposition/Deposition.cpp
diff --git a/Examples/Deposition/Deposition.py → examples/Deposition/Deposition.py b/Examples/Deposition/Deposition.py → examples/Deposition/Deposition.py
diff --git a/Examples/GeometricAdvection/CMakeLists.txt → examples/GeometricAdvection/CMakeLists.txt b/Examples/GeometricAdvection/CMakeLists.txt → examples/GeometricAdvection/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(GeometricAdvection LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...GeometricAdvection/GeometricAdvection.cpp → ...GeometricAdvection/GeometricAdvection.cpp b/...GeometricAdvection/GeometricAdvection.cpp → ...GeometricAdvection/GeometricAdvection.cpp
diff --git a/.../GeometricAdvection/GeometricAdvection.py → .../GeometricAdvection/GeometricAdvection.py b/.../GeometricAdvection/GeometricAdvection.py → .../GeometricAdvection/GeometricAdvection.py
diff --git a/Examples/PatternedSubstrate/CMakeLists.txt → examples/PatternedSubstrate/CMakeLists.txt b/Examples/PatternedSubstrate/CMakeLists.txt → examples/PatternedSubstrate/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(PatternedSubstrate LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...PatternedSubstrate/PatternedSubstrate.cpp → ...PatternedSubstrate/PatternedSubstrate.cpp b/...PatternedSubstrate/PatternedSubstrate.cpp → ...PatternedSubstrate/PatternedSubstrate.cpp
diff --git a/Examples/PeriodicBoundary/CMakeLists.txt → examples/PeriodicBoundary/CMakeLists.txt b/Examples/PeriodicBoundary/CMakeLists.txt → examples/PeriodicBoundary/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(PeriodicBoundary LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...les/PeriodicBoundary/PeriodicBoundary.cpp → ...les/PeriodicBoundary/PeriodicBoundary.cpp b/...les/PeriodicBoundary/PeriodicBoundary.cpp → ...les/PeriodicBoundary/PeriodicBoundary.cpp
diff --git a/Examples/SharedLib/CMakeLists.txt → examples/SharedLib/CMakeLists.txt b/Examples/SharedLib/CMakeLists.txt → examples/SharedLib/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(SharedLib LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Examples/SharedLib/SharedLib.cpp → examples/SharedLib/SharedLib.cpp b/Examples/SharedLib/SharedLib.cpp → examples/SharedLib/SharedLib.cpp
diff --git a/Examples/SquareEtch/CMakeLists.txt → examples/SquareEtch/CMakeLists.txt b/Examples/SquareEtch/CMakeLists.txt → examples/SquareEtch/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(SquareEtch LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Examples/SquareEtch/SquareEtch.cpp → examples/SquareEtch/SquareEtch.cpp b/Examples/SquareEtch/SquareEtch.cpp → examples/SquareEtch/SquareEtch.cpp
diff --git a/Examples/VoidEtching/CMakeLists.txt → examples/VoidEtching/CMakeLists.txt b/Examples/VoidEtching/CMakeLists.txt → examples/VoidEtching/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(VoidEtching LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Examples/VoidEtching/VoidEtching.cpp → examples/VoidEtching/VoidEtching.cpp b/Examples/VoidEtching/VoidEtching.cpp → examples/VoidEtching/VoidEtching.cpp
diff --git a/Examples/VolumeToLevelSets/CMakeLists.txt → examples/VolumeToLevelSets/CMakeLists.txt b/Examples/VolumeToLevelSets/CMakeLists.txt → examples/VolumeToLevelSets/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(VolumeToLevelSets LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...s/VolumeToLevelSets/VolumeToLevelSets.cpp → ...s/VolumeToLevelSets/VolumeToLevelSets.cpp b/...s/VolumeToLevelSets/VolumeToLevelSets.cpp → ...s/VolumeToLevelSets/VolumeToLevelSets.cpp
diff --git a/Python/CMakeLists.txt → python/CMakeLists.txt b/Python/CMakeLists.txt → python/CMakeLists.txt
@@ -37,11 +37,9 @@ endif()
 
 include("../cmake/vtk.cmake")
 
-if(WIN32 AND NOT VTK_DIR)
-  setup_vtk_env(${PROJECT_NAME} vtk_env)
-  set(VTK_DIR "${PROJECT_BINARY_DIR}/vtk_env")
-elseif(NOT VTK_DIR)
-  set(VTK_DIR "${VTK_LIBS}")
+if(WIN32 AND NOT VIENNALS_SYSTEM_VTK)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/vtk_env>)
+  setup_vtk_env(${PROJECT_NAME} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()
 
 # --------------------------------------------------------------------------------------------------------

diff --git a/Python/__init__.py.in → python/__init__.py.in b/Python/__init__.py.in → python/__init__.py.in
diff --git a/Python/pyWrap.cpp → python/pyWrap.cpp b/Python/pyWrap.cpp → python/pyWrap.cpp
diff --git a/Tests/Advection/Advection.cpp → tests/Advection/Advection.cpp b/Tests/Advection/Advection.cpp → tests/Advection/Advection.cpp
diff --git a/Tests/Advection/CMakeLists.txt → tests/Advection/CMakeLists.txt b/Tests/Advection/CMakeLists.txt → tests/Advection/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(Advection LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/Advection2D/Advection2D.cpp → tests/Advection2D/Advection2D.cpp b/Tests/Advection2D/Advection2D.cpp → tests/Advection2D/Advection2D.cpp
diff --git a/Tests/Advection2D/CMakeLists.txt → tests/Advection2D/CMakeLists.txt b/Tests/Advection2D/CMakeLists.txt → tests/Advection2D/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(Advection2D LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...AdvectionBenchmark/AdvectionBenchmark.cpp → ...AdvectionBenchmark/AdvectionBenchmark.cpp b/...AdvectionBenchmark/AdvectionBenchmark.cpp → ...AdvectionBenchmark/AdvectionBenchmark.cpp
diff --git a/Tests/AdvectionBenchmark/CMakeLists.txt → tests/AdvectionBenchmark/CMakeLists.txt b/Tests/AdvectionBenchmark/CMakeLists.txt → tests/AdvectionBenchmark/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(AdvectionBenchmark LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/AdvectionPlane/AdvectionPlane.cpp → tests/AdvectionPlane/AdvectionPlane.cpp b/Tests/AdvectionPlane/AdvectionPlane.cpp → tests/AdvectionPlane/AdvectionPlane.cpp
diff --git a/Tests/AdvectionPlane/CMakeLists.txt → tests/AdvectionPlane/CMakeLists.txt b/Tests/AdvectionPlane/CMakeLists.txt → tests/AdvectionPlane/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(AdvectionPlane LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/BooleanOperation/BooleanOperation.cpp → tests/BooleanOperation/BooleanOperation.cpp b/Tests/BooleanOperation/BooleanOperation.cpp → tests/BooleanOperation/BooleanOperation.cpp
diff --git a/Tests/BooleanOperation/CMakeLists.txt → tests/BooleanOperation/CMakeLists.txt b/Tests/BooleanOperation/CMakeLists.txt → tests/BooleanOperation/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(BooleanOperation LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...onExactZero/BooleanOperationExactZero.cpp → ...onExactZero/BooleanOperationExactZero.cpp b/...onExactZero/BooleanOperationExactZero.cpp → ...onExactZero/BooleanOperationExactZero.cpp
diff --git a/.../BooleanOperationExactZero/CMakeLists.txt → .../BooleanOperationExactZero/CMakeLists.txt b/.../BooleanOperationExactZero/CMakeLists.txt → .../BooleanOperationExactZero/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(BooleanOperationExactZero LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/BooleanOperationExactZero/result.hpp → tests/BooleanOperationExactZero/result.hpp b/Tests/BooleanOperationExactZero/result.hpp → tests/BooleanOperationExactZero/result.hpp
diff --git a/...ExactZero1/BooleanOperationExactZero1.cpp → ...ExactZero1/BooleanOperationExactZero1.cpp b/...ExactZero1/BooleanOperationExactZero1.cpp → ...ExactZero1/BooleanOperationExactZero1.cpp
diff --git a/...BooleanOperationExactZero1/CMakeLists.txt → ...BooleanOperationExactZero1/CMakeLists.txt b/...BooleanOperationExactZero1/CMakeLists.txt → ...BooleanOperationExactZero1/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(BooleanOperationExactZero1 LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...BoundaryConditions/BoundaryConditions.cpp → ...BoundaryConditions/BoundaryConditions.cpp b/...BoundaryConditions/BoundaryConditions.cpp → ...BoundaryConditions/BoundaryConditions.cpp
diff --git a/Tests/BoundaryConditions/CMakeLists.txt → tests/BoundaryConditions/CMakeLists.txt b/Tests/BoundaryConditions/CMakeLists.txt → tests/BoundaryConditions/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(BoundaryConditions LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/CMakeLists.txt → tests/CMakeLists.txt b/Tests/CMakeLists.txt → tests/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_custom_target(ViennaLS_Tests ALL)
 
-if(NOT VTK_DIR)
-  include("../cmake/vtk.cmake")
-  setup_vtk_env(ViennaLS_Tests "tests")
+if(WIN32 AND NOT VIENNALS_SYSTEM_VTK)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/tests>)
+  setup_vtk_env(ViennaLS_Tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()
 
 file(

diff --git a/Tests/CalculateCurvatures/CMakeLists.txt → tests/CalculateCurvatures/CMakeLists.txt b/Tests/CalculateCurvatures/CMakeLists.txt → tests/CalculateCurvatures/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(CalculateCurvatures LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...lculateCurvatures/CalculateCurvatures.cpp → ...lculateCurvatures/CalculateCurvatures.cpp b/...lculateCurvatures/CalculateCurvatures.cpp → ...lculateCurvatures/CalculateCurvatures.cpp
diff --git a/Tests/CalculateNormalVectors/CMakeLists.txt → tests/CalculateNormalVectors/CMakeLists.txt b/Tests/CalculateNormalVectors/CMakeLists.txt → tests/CalculateNormalVectors/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(CalculateNormalVectors LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...eNormalVectors/CalculateNormalVectors.cpp → ...eNormalVectors/CalculateNormalVectors.cpp b/...eNormalVectors/CalculateNormalVectors.cpp → ...eNormalVectors/CalculateNormalVectors.cpp
diff --git a/Tests/ConvexHull/CMakeLists.txt → tests/ConvexHull/CMakeLists.txt b/Tests/ConvexHull/CMakeLists.txt → tests/ConvexHull/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(ConvexHull LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/ConvexHull/ConvexHull.cpp → tests/ConvexHull/ConvexHull.cpp b/Tests/ConvexHull/ConvexHull.cpp → tests/ConvexHull/ConvexHull.cpp
diff --git a/Tests/ConvexHull3D/CMakeLists.txt → tests/ConvexHull3D/CMakeLists.txt b/Tests/ConvexHull3D/CMakeLists.txt → tests/ConvexHull3D/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(ConvexHull3D LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/ConvexHull3D/ConvexHull3D.cpp → tests/ConvexHull3D/ConvexHull3D.cpp b/Tests/ConvexHull3D/ConvexHull3D.cpp → tests/ConvexHull3D/ConvexHull3D.cpp
diff --git a/Tests/DiskMesh/CMakeLists.txt → tests/DiskMesh/CMakeLists.txt b/Tests/DiskMesh/CMakeLists.txt → tests/DiskMesh/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(DiskMesh LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/DiskMesh/DiskMesh.cpp → tests/DiskMesh/DiskMesh.cpp b/Tests/DiskMesh/DiskMesh.cpp → tests/DiskMesh/DiskMesh.cpp
diff --git a/Tests/Expand/CMakeLists.txt → tests/Expand/CMakeLists.txt b/Tests/Expand/CMakeLists.txt → tests/Expand/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(Expand LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/Expand/Expand.cpp → tests/Expand/Expand.cpp b/Tests/Expand/Expand.cpp → tests/Expand/Expand.cpp
diff --git a/Tests/Extrude/CMakeLists.txt → tests/Extrude/CMakeLists.txt b/Tests/Extrude/CMakeLists.txt → tests/Extrude/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(Extrude LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/Extrude/Extrude.cpp → tests/Extrude/Extrude.cpp b/Tests/Extrude/Extrude.cpp → tests/Extrude/Extrude.cpp
diff --git a/Tests/FeatureDetection/CMakeLists.txt → tests/FeatureDetection/CMakeLists.txt b/Tests/FeatureDetection/CMakeLists.txt → tests/FeatureDetection/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(FeatureDetection LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/FeatureDetection/FeatureDetection.cpp → tests/FeatureDetection/FeatureDetection.cpp b/Tests/FeatureDetection/FeatureDetection.cpp → tests/FeatureDetection/FeatureDetection.cpp
diff --git a/Tests/FileWriter/CMakeLists.txt → tests/FileWriter/CMakeLists.txt b/Tests/FileWriter/CMakeLists.txt → tests/FileWriter/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(FileWriter LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/FileWriter/FileWriter.cpp → tests/FileWriter/FileWriter.cpp b/Tests/FileWriter/FileWriter.cpp → tests/FileWriter/FileWriter.cpp
diff --git a/Tests/FromMesh/CMakeLists.txt → tests/FromMesh/CMakeLists.txt b/Tests/FromMesh/CMakeLists.txt → tests/FromMesh/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(FromMesh LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/FromMesh/FromMesh.cpp → tests/FromMesh/FromMesh.cpp b/Tests/FromMesh/FromMesh.cpp → tests/FromMesh/FromMesh.cpp
diff --git a/Tests/GenerateHoleGeometry/CMakeLists.txt → tests/GenerateHoleGeometry/CMakeLists.txt b/Tests/GenerateHoleGeometry/CMakeLists.txt → tests/GenerateHoleGeometry/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(GenerateHoleGeometry LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...rateHoleGeometry/GenerateHoleGeometry.cpp → ...rateHoleGeometry/GenerateHoleGeometry.cpp b/...rateHoleGeometry/GenerateHoleGeometry.cpp → ...rateHoleGeometry/GenerateHoleGeometry.cpp
diff --git a/Tests/GeometricAdvect/CMakeLists.txt → tests/GeometricAdvect/CMakeLists.txt b/Tests/GeometricAdvect/CMakeLists.txt → tests/GeometricAdvect/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(GeometricAdvect LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/GeometricAdvect/GeometricAdvect.cpp → tests/GeometricAdvect/GeometricAdvect.cpp b/Tests/GeometricAdvect/GeometricAdvect.cpp → tests/GeometricAdvect/GeometricAdvect.cpp
diff --git a/Tests/GeometricAdvectMask/CMakeLists.txt → tests/GeometricAdvectMask/CMakeLists.txt b/Tests/GeometricAdvectMask/CMakeLists.txt → tests/GeometricAdvectMask/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(GeometricAdvectMask LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...ometricAdvectMask/GeometricAdvectMask.cpp → ...ometricAdvectMask/GeometricAdvectMask.cpp b/...ometricAdvectMask/GeometricAdvectMask.cpp → ...ometricAdvectMask/GeometricAdvectMask.cpp
diff --git a/...GeometricAdvectPerformance/CMakeLists.txt → ...GeometricAdvectPerformance/CMakeLists.txt b/...GeometricAdvectPerformance/CMakeLists.txt → ...GeometricAdvectPerformance/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(GeometricAdvectPerformance LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...erformance/GeometricAdvectPerformance.cpp → ...erformance/GeometricAdvectPerformance.cpp b/...erformance/GeometricAdvectPerformance.cpp → ...erformance/GeometricAdvectPerformance.cpp
diff --git a/Tests/GeometricAdvectTrench/CMakeLists.txt → tests/GeometricAdvectTrench/CMakeLists.txt b/Tests/GeometricAdvectTrench/CMakeLists.txt → tests/GeometricAdvectTrench/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(GeometricAdvectTrench LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...ricAdvectTrench/GeometricAdvectTrench.cpp → ...ricAdvectTrench/GeometricAdvectTrench.cpp b/...ricAdvectTrench/GeometricAdvectTrench.cpp → ...ricAdvectTrench/GeometricAdvectTrench.cpp
diff --git a/Tests/HullMesh/CMakeLists.txt → tests/HullMesh/CMakeLists.txt b/Tests/HullMesh/CMakeLists.txt → tests/HullMesh/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(HullMesh LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/HullMesh/HullMesh.cpp → tests/HullMesh/HullMesh.cpp b/Tests/HullMesh/HullMesh.cpp → tests/HullMesh/HullMesh.cpp
diff --git a/Tests/Make3DSphere/CMakeLists.txt → tests/Make3DSphere/CMakeLists.txt b/Tests/Make3DSphere/CMakeLists.txt → tests/Make3DSphere/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(Make3DSphere LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/Make3DSphere/Make3DSphere.cpp → tests/Make3DSphere/Make3DSphere.cpp b/Tests/Make3DSphere/Make3DSphere.cpp → tests/Make3DSphere/Make3DSphere.cpp
diff --git a/Tests/MakeBox/CMakeLists.txt → tests/MakeBox/CMakeLists.txt b/Tests/MakeBox/CMakeLists.txt → tests/MakeBox/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(MakeBox LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/MakeBox/MakeBox.cpp → tests/MakeBox/MakeBox.cpp b/Tests/MakeBox/MakeBox.cpp → tests/MakeBox/MakeBox.cpp
diff --git a/Tests/MakeGeometry/CMakeLists.txt → tests/MakeGeometry/CMakeLists.txt b/Tests/MakeGeometry/CMakeLists.txt → tests/MakeGeometry/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(MakeGeometry LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/MakeGeometry/MakeGeometry.cpp → tests/MakeGeometry/MakeGeometry.cpp b/Tests/MakeGeometry/MakeGeometry.cpp → tests/MakeGeometry/MakeGeometry.cpp
diff --git a/Tests/MakePlane/CMakeLists.txt → tests/MakePlane/CMakeLists.txt b/Tests/MakePlane/CMakeLists.txt → tests/MakePlane/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(MakePlane LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/MakePlane/MakePlane.cpp → tests/MakePlane/MakePlane.cpp b/Tests/MakePlane/MakePlane.cpp → tests/MakePlane/MakePlane.cpp
diff --git a/Tests/MakeSphere/CMakeLists.txt → tests/MakeSphere/CMakeLists.txt b/Tests/MakeSphere/CMakeLists.txt → tests/MakeSphere/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(MakeSphere LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/MakeSphere/MakeSphere.cpp → tests/MakeSphere/MakeSphere.cpp b/Tests/MakeSphere/MakeSphere.cpp → tests/MakeSphere/MakeSphere.cpp
diff --git a/Tests/MarkVoidPoints/CMakeLists.txt → tests/MarkVoidPoints/CMakeLists.txt b/Tests/MarkVoidPoints/CMakeLists.txt → tests/MarkVoidPoints/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(MarkVoidPoints LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/MarkVoidPoints/MarkVoidPoints.cpp → tests/MarkVoidPoints/MarkVoidPoints.cpp b/Tests/MarkVoidPoints/MarkVoidPoints.cpp → tests/MarkVoidPoints/MarkVoidPoints.cpp
diff --git a/Tests/MultiMaterialAdvection/CMakeLists.txt → tests/MultiMaterialAdvection/CMakeLists.txt b/Tests/MultiMaterialAdvection/CMakeLists.txt → tests/MultiMaterialAdvection/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(MultiMaterialAdvection LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...erialAdvection/MultiMaterialAdvection.cpp → ...erialAdvection/MultiMaterialAdvection.cpp b/...erialAdvection/MultiMaterialAdvection.cpp → ...erialAdvection/MultiMaterialAdvection.cpp
diff --git a/Tests/MultiMaterialEtch/CMakeLists.txt → tests/MultiMaterialEtch/CMakeLists.txt b/Tests/MultiMaterialEtch/CMakeLists.txt → tests/MultiMaterialEtch/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(MultiMaterialEtch LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...s/MultiMaterialEtch/MultiMaterialEtch.cpp → ...s/MultiMaterialEtch/MultiMaterialEtch.cpp b/...s/MultiMaterialEtch/MultiMaterialEtch.cpp → ...s/MultiMaterialEtch/MultiMaterialEtch.cpp
diff --git a/Tests/PeriodicBoundary2D/CMakeLists.txt → tests/PeriodicBoundary2D/CMakeLists.txt b/Tests/PeriodicBoundary2D/CMakeLists.txt → tests/PeriodicBoundary2D/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(PeriodicBoundary2D LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...PeriodicBoundary2D/PeriodicBoundary2D.cpp → ...PeriodicBoundary2D/PeriodicBoundary2D.cpp b/...PeriodicBoundary2D/PeriodicBoundary2D.cpp → ...PeriodicBoundary2D/PeriodicBoundary2D.cpp
diff --git a/Tests/ReadFromFile/CMakeLists.txt → tests/ReadFromFile/CMakeLists.txt b/Tests/ReadFromFile/CMakeLists.txt → tests/ReadFromFile/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(ReadFromFile LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/ReadFromFile/ReadFromFile.cpp → tests/ReadFromFile/ReadFromFile.cpp b/Tests/ReadFromFile/ReadFromFile.cpp → tests/ReadFromFile/ReadFromFile.cpp
diff --git a/Tests/ReadVolume/CMakeLists.txt → tests/ReadVolume/CMakeLists.txt b/Tests/ReadVolume/CMakeLists.txt → tests/ReadVolume/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(ReadVolume LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/ReadVolume/ReadVolume.cpp → tests/ReadVolume/ReadVolume.cpp b/Tests/ReadVolume/ReadVolume.cpp → tests/ReadVolume/ReadVolume.cpp
diff --git a/Tests/RemoveStrayPoints/CMakeLists.txt → tests/RemoveStrayPoints/CMakeLists.txt b/Tests/RemoveStrayPoints/CMakeLists.txt → tests/RemoveStrayPoints/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(RemoveStrayPoints LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...s/RemoveStrayPoints/RemoveStrayPoints.cpp → ...s/RemoveStrayPoints/RemoveStrayPoints.cpp b/...s/RemoveStrayPoints/RemoveStrayPoints.cpp → ...s/RemoveStrayPoints/RemoveStrayPoints.cpp
diff --git a/Tests/RotateMesh/CMakeLists.txt → tests/RotateMesh/CMakeLists.txt b/Tests/RotateMesh/CMakeLists.txt → tests/RotateMesh/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(RotateMesh LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/RotateMesh/RotateMesh.cpp → tests/RotateMesh/RotateMesh.cpp b/Tests/RotateMesh/RotateMesh.cpp → tests/RotateMesh/RotateMesh.cpp
diff --git a/Tests/Serialize/CMakeLists.txt → tests/Serialize/CMakeLists.txt b/Tests/Serialize/CMakeLists.txt → tests/Serialize/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(Serialize LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/Serialize/Serialize.cpp → tests/Serialize/Serialize.cpp b/Tests/Serialize/Serialize.cpp → tests/Serialize/Serialize.cpp
diff --git a/Tests/SmartPointer/CMakeLists.txt → tests/SmartPointer/CMakeLists.txt b/Tests/SmartPointer/CMakeLists.txt → tests/SmartPointer/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(SmartPointer LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/SmartPointer/SmartPointer.cpp → tests/SmartPointer/SmartPointer.cpp b/Tests/SmartPointer/SmartPointer.cpp → tests/SmartPointer/SmartPointer.cpp
diff --git a/Tests/VisualizationMesh/CMakeLists.txt → tests/VisualizationMesh/CMakeLists.txt b/Tests/VisualizationMesh/CMakeLists.txt → tests/VisualizationMesh/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(VisualizationMesh LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/...s/VisualizationMesh/VisualizationMesh.cpp → ...s/VisualizationMesh/VisualizationMesh.cpp b/...s/VisualizationMesh/VisualizationMesh.cpp → ...s/VisualizationMesh/VisualizationMesh.cpp
diff --git a/Tests/VoidDetection/CMakeLists.txt → tests/VoidDetection/CMakeLists.txt b/Tests/VoidDetection/CMakeLists.txt → tests/VoidDetection/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.14)
 project(VoidDetection LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp")

diff --git a/Tests/VoidDetection/VoidDetection.cpp → tests/VoidDetection/VoidDetection.cpp b/Tests/VoidDetection/VoidDetection.cpp → tests/VoidDetection/VoidDetection.cpp