Enable building examples and tutorials on Windows (#1667)

* Enable examples on Windows * Fix build errors on Windows + VS2022 * Enable tutorials on Windows
dartsim · May 30, 2022 · 22bbcde · 22bbcde
1 parent d28c286
commit 22bbcde
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -336,7 +336,7 @@ if(TARGET dart)
 
   # Add example subdirectories and an "examples" target.
   if(MSVC)
-    # add_subdirectory(examples)
+    add_subdirectory(examples)
   else()
     add_subdirectory(examples EXCLUDE_FROM_ALL)
     get_property(examples GLOBAL PROPERTY DART_EXAMPLES)
@@ -356,7 +356,7 @@ if(TARGET dart)
 
   # Add a "tutorials" target to build tutorials.
   if(MSVC)
-    # add_subdirectory(tutorials)
+    add_subdirectory(tutorials)
   else()
     add_subdirectory(tutorials EXCLUDE_FROM_ALL)
     get_property(tutorials GLOBAL PROPERTY DART_TUTORIALS)

diff --git a/examples/atlas_simbicon/TerminalCondition.cpp b/examples/atlas_simbicon/TerminalCondition.cpp
@@ -90,14 +90,14 @@ bool BodyContactCondition::isSatisfied()
     for (std::size_t i = 0; i < soft->getNumPointMasses(); ++i)
     {
       PointMass* pm = soft->getPointMass(i);
-      if (pm->isColliding() > 0)
+      if (pm->isColliding())
         return true;
     }
   }
 
   // TODO(JS): Need more elegant condition check method
   DART_SUPPRESS_DEPRECATED_BEGIN
-  if (mBodyNode->isColliding() > 0)
+  if (mBodyNode->isColliding())
     DART_SUPPRESS_DEPRECATED_END
     {
       //    dtmsg << "BodyNode [" << mBodyNode->getName() << "] is in contact."

diff --git a/examples/deprecated_examples/glut_atlas_simbicon/TerminalCondition.cpp b/examples/deprecated_examples/glut_atlas_simbicon/TerminalCondition.cpp
@@ -90,14 +90,14 @@ bool BodyContactCondition::isSatisfied()
     for (std::size_t i = 0; i < soft->getNumPointMasses(); ++i)
     {
       PointMass* pm = soft->getPointMass(i);
-      if (pm->isColliding() > 0)
+      if (pm->isColliding())
         return true;
     }
   }
 
   // TODO(JS): Need more elegant condition check method
   DART_SUPPRESS_DEPRECATED_BEGIN
-  if (mBodyNode->isColliding() > 0)
+  if (mBodyNode->isColliding())
     DART_SUPPRESS_DEPRECATED_END
     {
       //    dtmsg << "BodyNode [" << mBodyNode->getName() << "] is in contact."