Merge branch 'InteractiveComputerGraphics:master' into fix-macos

ruberith · web-flow · commit 0040fa3db481 · 2023-03-05T14:55:44.000+01:00
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,6 @@
+2.12.2
+	- added a CMake option for each tool so that the build can be disabled/enabled
+
 2.12.1
 	- all scene file parameters are now GenericParameters
 	- updated Python examples
diff --git a/README.md b/README.md
@@ -254,6 +254,7 @@ https://ge.in.tum.de/publications/2020-ummenhofer-iclr/
 https://dl.acm.org/doi/10.1145/3355089.3356503
 * Zhongyao Yang, Maolin Wu, Shiguang Liu. Helmholtz decomposition-based SPH. Virtual Reality & Intelligent Hardware 3, 2, 2021
 https://www.sciencedirect.com/science/article/pii/S2096579621000176
-
+* Min Li, Hongshu Li, Weiliang Meng, Jian Zhu, Gary Zhang. An efficient non-iterative smoothed particle hydrodynamics fluid simulation method with variable smoothing length. Visual Computing for Industry, Biomedicine, and Art 6, 1, 2023
+* Yalmar Ponce Atencio, Manuel J. Ibarra, Juan José Oré Cerrón, Roberto Quispe Quispe, Richard Flores Condori, Julio Huanca Marín, Mary Huaman Carrión. Particle-Based Physics for Interactive Applications. Lecture Notes in Networks and Systems book series (LNNS,volume 216), 2021
 
 
diff --git a/Tools/CMakeLists.txt b/Tools/CMakeLists.txt
@@ -1,8 +1,15 @@
-add_subdirectory(PartioViewer)
-add_subdirectory(FoamGenerator)
-add_subdirectory(SurfaceSampling)
-add_subdirectory(VolumeSampling)
-add_subdirectory(partio2vtk)
-add_subdirectory(MeshSkinning)
-add_subdirectory(ParameterParser)
+macro(add_tool arg)
+    option(Build_${arg} "Build ${arg}"	ON)
+	if (Build_${arg})
+		add_subdirectory(${arg})
+	endif()
+endmacro()
+
+add_tool(PartioViewer)
+add_tool(FoamGenerator)
+add_tool(SurfaceSampling)
+add_tool(VolumeSampling)
+add_tool(partio2vtk)
+add_tool(MeshSkinning)
+add_tool(ParameterParser)
 
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.12.1
+2.12.2
