Merge branch 'minor_fixes' into 'master'

Minor fixes

See merge request iMSTK/iMSTK!486

CMake/External/External_VTK.cmake

@@ -15,26 +15,26 @@ set_property(CACHE ${PROJECT_NAME}_VTK_REPO_SOURCE PROPERTY STRINGS ${VTK_SOURCE
 
 set(VTK_MODULE_SETTINGS
   -DVTK_MODULE_ENABLE_VTK_ChartsCore:STRING=YES
-  -DVTK_MODULE_ENABLE_MODULE_FiltersExtraction:STRING=YES
-  -DVTK_MODULE_ENABLE_MODULE_FiltersModeling:STRING=YES
+  -DVTK_MODULE_ENABLE_VTK_FiltersExtraction:STRING=YES
+  -DVTK_MODULE_ENABLE_VTK_FiltersModeling:STRING=YES
   -DVTK_MODULE_ENABLE_VTK_IOExport:STRING=YES
+  -DVTK_MODULE_ENABLE_VTK_IOGeometry:STRING=YES
   -DVTK_MODULE_ENABLE_VTK_IOImport:STRING=YES
+  -DVTK_MODULE_ENABLE_VTK_IOLegacy:STRING=YES
+  -DVTK_MODULE_ENABLE_VTK_IOPLY:STRING=YES
   -DVTK_MODULE_ENABLE_VTK_IOParallel:STRING=YES
   -DVTK_MODULE_ENABLE_VTK_IOParallelXML:STRING=YES
   -DVTK_MODULE_ENABLE_VTK_IOXML:STRING=YES
-  -DVTK_MODULE_ENABLE_VTK_IOLegacy:STRING=YES
-  -DVTK_MODULE_ENABLE_VTK_IOPLY:STRING=YES
-  -DVTK_MODULE_ENABLE_VTK_IOGeometry:STRING=YES
   -DVTK_MODULE_ENABLE_VTK_InteractionStyle:STRING=YES
-  -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation:STRING=YES
-  -DVTK_MODULE_ENABLE_VTK_RenderingOpenVR:STRING=${VTK_ENABLE_OPENVR}
   -DVTK_MODULE_ENABLE_VTK_InteractionWidgets:STRING=YES
-  -DVTK_MODULE_ENABLE_VTK_glew:STRING=YES
+  -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation:STRING=YES
   -DVTK_MODULE_ENABLE_VTK_RenderingContext2D:STRING=YES
   -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2:STRING=YES
   -DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2:STRING=YES
+  -DVTK_MODULE_ENABLE_VTK_RenderingOpenVR:STRING=${VTK_ENABLE_OPENVR}
   -DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2:STRING=YES
   -DVTK_MODULE_ENABLE_VTK_ViewsContext2D:STRING=YES
+  -DVTK_MODULE_ENABLE_VTK_glew:STRING=YES
   -DVTK_BUILD_EXAMPLES:STRING=DONT_WANT
   -DVTK_BUILD_TESTING:STRING=OFF
   -DVTK_GROUP_ENABLE_StandAlone:STRING=DONT_WANT

Source/GeometryMappers/imstkTetraTriangleMap.cpp

@@ -140,7 +140,7 @@ TetraTriangleMap::isValid() const
 {
     auto meshMaster = static_cast<TetrahedralMesh*>(m_master.get());
 #if defined(DEBUG) || defined(_DEBUG) || !defined(NDEBUG)
-    CHECK(dynamic_cast<TetrahedralMesh*>(m_master.get())) << "Fail to cast from geometry to mesh";
+    CHECK(dynamic_cast<TetrahedralMesh*>(m_master.get()) == nullptr) << "Fail to cast from geometry to mesh";
 #endif
 
     auto totalElementsMaster = meshMaster->getNumTetrahedra();

Source/Scene/imstkScene.h

@@ -23,6 +23,7 @@
 
 #include <atomic>
 #include <functional>
+#include <string>
 #include <thread>
 #include <unordered_map>
 #include <vector>