dartsim · jslee02 · Apr 24, 2016 · Apr 22, 2016 · Apr 22, 2016 · Apr 24, 2016
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -279,7 +279,7 @@ endfunction(dart_add_unittest)
 #===============================================================================
 
 add_subdirectory(dart)
-add_subdirectory(apps EXCLUDE_FROM_ALL)
+add_subdirectory(examples EXCLUDE_FROM_ALL)
 add_subdirectory(tutorials EXCLUDE_FROM_ALL)
 
 # Add a "tutorials" target to build tutorials.

diff --git a/apps/addDeleteSkels/CMakeLists.txt b/apps/addDeleteSkels/CMakeLists.txt
diff --git a/apps/atlasSimbicon/CMakeLists.txt b/apps/atlasSimbicon/CMakeLists.txt
diff --git a/apps/bipedStand/CMakeLists.txt b/apps/bipedStand/CMakeLists.txt
diff --git a/apps/hardcodedDesign/CMakeLists.txt b/apps/hardcodedDesign/CMakeLists.txt
diff --git a/apps/hybridDynamics/CMakeLists.txt b/apps/hybridDynamics/CMakeLists.txt
diff --git a/apps/jointConstraints/CMakeLists.txt b/apps/jointConstraints/CMakeLists.txt
diff --git a/apps/mixedChain/CMakeLists.txt b/apps/mixedChain/CMakeLists.txt
diff --git a/apps/operationalSpaceControl/CMakeLists.txt b/apps/operationalSpaceControl/CMakeLists.txt
diff --git a/apps/rigidChain/CMakeLists.txt b/apps/rigidChain/CMakeLists.txt
diff --git a/apps/rigidCubes/CMakeLists.txt b/apps/rigidCubes/CMakeLists.txt
diff --git a/apps/rigidLoop/CMakeLists.txt b/apps/rigidLoop/CMakeLists.txt
diff --git a/apps/rigidShapes/CMakeLists.txt b/apps/rigidShapes/CMakeLists.txt
diff --git a/apps/simpleFrames/CMakeLists.txt b/apps/simpleFrames/CMakeLists.txt
diff --git a/apps/softBodies/CMakeLists.txt b/apps/softBodies/CMakeLists.txt
diff --git a/apps/speedTest/CMakeLists.txt b/apps/speedTest/CMakeLists.txt
diff --git a/apps/vehicle/CMakeLists.txt b/apps/vehicle/CMakeLists.txt
diff --git a/dart/CMakeLists.txt b/dart/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Enable multi-threaded compilation.
-# We do this here and not in the root folder since the example apps
-# do not have enough source files to benefit from this.
+# We do this here and not in the root folder since the examples and the
+# tutorials do not have enough source files to benefit from this.
 if(MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 endif()

diff --git a/apps/CMakeLists.txt → examples/CMakeLists.txt b/apps/CMakeLists.txt → examples/CMakeLists.txt
@@ -1,7 +1,7 @@
-# A list of applications
-set_property(DIRECTORY PROPERTY FOLDER Apps)
+# A list of examples
+set_property(DIRECTORY PROPERTY FOLDER Examples)
 
-# Automatically identify all directories in the apps folder
+# Automatically identify all directories in the examples folder
 file(GLOB children RELATIVE ${CMAKE_CURRENT_LIST_DIR} "*")
 set(directories "")
 foreach(child ${children})
@@ -13,7 +13,7 @@ foreach(child ${children})
 endforeach(child)
 
 # List of all the subdirectories to include
-foreach(APPDIR ${directories})
-  add_subdirectory(${APPDIR})
-  dart_add_example(${APPDIR})
-endforeach(APPDIR)
+foreach(EXAMPLE_DIR ${directories})
+  add_subdirectory(${EXAMPLE_DIR})
+  dart_add_example(${EXAMPLE_DIR})
+endforeach(EXAMPLE_DIR)
diff --git a/examples/addDeleteSkels/CMakeLists.txt b/examples/addDeleteSkels/CMakeLists.txt
@@ -0,0 +1,10 @@
+###############################################################
+# This file can be used as-is in the directory of any example,#
+# however you might need to specify your own dependencies in  #
+# target_link_libraries if your app depends on more than dart #
+###############################################################
+get_filename_component(example_name ${CMAKE_CURRENT_LIST_DIR} NAME)
+file(GLOB ${example_name}_srcs "*.cpp" "*.h" "*.hpp")
+add_executable(${example_name} ${${example_name}_srcs})
+target_link_libraries(${example_name} dart dart-gui)
+set_target_properties(${example_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
diff --git a/apps/addDeleteSkels/Main.cpp → examples/addDeleteSkels/Main.cpp b/apps/addDeleteSkels/Main.cpp → examples/addDeleteSkels/Main.cpp
diff --git a/apps/addDeleteSkels/MyWindow.cpp → examples/addDeleteSkels/MyWindow.cpp b/apps/addDeleteSkels/MyWindow.cpp → examples/addDeleteSkels/MyWindow.cpp
diff --git a/apps/addDeleteSkels/MyWindow.h → examples/addDeleteSkels/MyWindow.h b/apps/addDeleteSkels/MyWindow.h → examples/addDeleteSkels/MyWindow.h
@@ -35,8 +35,8 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef APPS_ADDDELETESKELS_MYWINDOW_H_
-#define APPS_ADDDELETESKELS_MYWINDOW_H_
+#ifndef EXAMPLES_ADDDELETESKELS_MYWINDOW_H_
+#define EXAMPLES_ADDDELETESKELS_MYWINDOW_H_
 
 #include "dart/dart.h"
 #include "dart/gui/gui.h"
@@ -63,4 +63,4 @@ class MyWindow : public dart::gui::SimWindow {
       double _mass = 0.1);
 };
 
-#endif  // APPS_ADDDELETESKELS_MYWINDOW_H_
+#endif  // EXAMPLES_ADDDELETESKELS_MYWINDOW_H_
diff --git a/examples/atlasSimbicon/CMakeLists.txt b/examples/atlasSimbicon/CMakeLists.txt
@@ -0,0 +1,11 @@
+###############################################################
+# This file can be used as-is in the directory of any example,#
+# however you might need to specify your own dependencies in  #
+# target_link_libraries if your app depends on more than dart #
+###############################################################
+get_filename_component(example_name ${CMAKE_CURRENT_LIST_DIR} NAME)
+file(GLOB ${example_name}_srcs "*.cpp" "*.h" "*.hpp")
+add_executable(${example_name} ${${example_name}_srcs})
+target_link_libraries(${example_name} dart dart-gui dart-utils-urdf)
+set_target_properties(${example_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+
diff --git a/apps/atlasSimbicon/Controller.cpp → examples/atlasSimbicon/Controller.cpp b/apps/atlasSimbicon/Controller.cpp → examples/atlasSimbicon/Controller.cpp
@@ -34,11 +34,11 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "apps/atlasSimbicon/Controller.h"
+#include "examples/atlasSimbicon/Controller.h"
 
-#include "apps/atlasSimbicon/State.h"
-#include "apps/atlasSimbicon/StateMachine.h"
-#include "apps/atlasSimbicon/TerminalCondition.h"
+#include "examples/atlasSimbicon/State.h"
+#include "examples/atlasSimbicon/StateMachine.h"
+#include "examples/atlasSimbicon/TerminalCondition.h"
 
 using namespace std;
 

diff --git a/apps/atlasSimbicon/Controller.h → examples/atlasSimbicon/Controller.h b/apps/atlasSimbicon/Controller.h → examples/atlasSimbicon/Controller.h
@@ -34,8 +34,8 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef APPS_ATLASROBOT_CONTROLLER_H_
-#define APPS_ATLASROBOT_CONTROLLER_H_
+#ifndef EXAMPLES_ATLASSIMBICON_CONTROLLER_H_
+#define EXAMPLES_ATLASSIMBICON_CONTROLLER_H_
 
 #include <vector>
 
@@ -184,4 +184,4 @@ class Controller
   dart::dynamics::Skeleton::Configuration mInitialState;
 };
 
-#endif  // APPS_ATLASROBOT_CONTROLLER_H_
+#endif  // EXAMPLES_ATLASSIMBICON_CONTROLLER_H_
diff --git a/apps/atlasSimbicon/Humanoid.cpp → examples/atlasSimbicon/Humanoid.cpp b/apps/atlasSimbicon/Humanoid.cpp → examples/atlasSimbicon/Humanoid.cpp
@@ -34,9 +34,9 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "apps/atlasSimbicon/Humanoid.h"
+#include "examples/atlasSimbicon/Humanoid.h"
 
-#include "apps/atlasSimbicon/State.h"
+#include "examples/atlasSimbicon/State.h"
 
 // Macro for functions not implemented yet
 #define NOT_YET(FUNCTION) std::cout << #FUNCTION\

diff --git a/apps/atlasSimbicon/Humanoid.h → examples/atlasSimbicon/Humanoid.h b/apps/atlasSimbicon/Humanoid.h → examples/atlasSimbicon/Humanoid.h
@@ -34,8 +34,8 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef APPS_ATLASROBOT_HUMANOID_H_
-#define APPS_ATLASROBOT_HUMANOID_H_
+#ifndef EXAMPLES_ATLASSIMBICON_HUMANOID_H_
+#define EXAMPLES_ATLASSIMBICON_HUMANOID_H_
 
 #include <vector>
 #include <string>
@@ -123,4 +123,4 @@ class AtlasRobot : public Humanoid
 protected:
 };
 
-#endif  // APPS_ATLASROBOT_HUMANOID_H_
+#endif  // EXAMPLES_ATLASSIMBICON_HUMANOID_H_
diff --git a/apps/atlasSimbicon/Main.cpp → examples/atlasSimbicon/Main.cpp b/apps/atlasSimbicon/Main.cpp → examples/atlasSimbicon/Main.cpp
@@ -39,8 +39,8 @@
 
 #include "dart/dart.h"
 
-#include "apps/atlasSimbicon/MyWindow.h"
-#include "apps/atlasSimbicon/Controller.h"
+#include "examples/atlasSimbicon/MyWindow.h"
+#include "examples/atlasSimbicon/Controller.h"
 
 using namespace std;
 using namespace Eigen;

diff --git a/apps/atlasSimbicon/MyWindow.cpp → examples/atlasSimbicon/MyWindow.cpp b/apps/atlasSimbicon/MyWindow.cpp → examples/atlasSimbicon/MyWindow.cpp
@@ -35,7 +35,7 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "apps/atlasSimbicon/MyWindow.h"
+#include "examples/atlasSimbicon/MyWindow.h"
 
 //==============================================================================
 MyWindow::MyWindow(Controller* _controller)

diff --git a/apps/atlasSimbicon/MyWindow.h → examples/atlasSimbicon/MyWindow.h b/apps/atlasSimbicon/MyWindow.h → examples/atlasSimbicon/MyWindow.h
@@ -35,13 +35,13 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef APPS_ATLASROBOT_MYWINDOW_H_
-#define APPS_ATLASROBOT_MYWINDOW_H_
+#ifndef EXAMPLES_ATLASSIMBICON_MYWINDOW_H_
+#define EXAMPLES_ATLASSIMBICON_MYWINDOW_H_
 
 #include "dart/dart.h"
 #include "dart/gui/gui.h"
 
-#include "apps/atlasSimbicon/Controller.h"
+#include "examples/atlasSimbicon/Controller.h"
 
 /// \brief class MyWindow
 class MyWindow : public dart::gui::SimWindow
@@ -73,4 +73,4 @@ class MyWindow : public dart::gui::SimWindow
   Controller* mController;
 };
 
-#endif  // APPS_ATLASROBOT_MYWINDOW_H_
+#endif  // EXAMPLES_ATLASSIMBICON_MYWINDOW_H_
diff --git a/apps/atlasSimbicon/State.cpp → examples/atlasSimbicon/State.cpp b/apps/atlasSimbicon/State.cpp → examples/atlasSimbicon/State.cpp
@@ -34,9 +34,9 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "apps/atlasSimbicon/State.h"
+#include "examples/atlasSimbicon/State.h"
 
-#include "apps/atlasSimbicon/TerminalCondition.h"
+#include "examples/atlasSimbicon/TerminalCondition.h"
 
 // Macro for functions not implemented yet
 #define NOT_YET(FUNCTION) std::cout << #FUNCTION\

diff --git a/apps/atlasSimbicon/State.h → examples/atlasSimbicon/State.h b/apps/atlasSimbicon/State.h → examples/atlasSimbicon/State.h
@@ -34,8 +34,8 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef APPS_ATLASROBOT_STATE_H_
-#define APPS_ATLASROBOT_STATE_H_
+#ifndef EXAMPLES_ATLASSIMBICON_STATE_H_
+#define EXAMPLES_ATLASSIMBICON_STATE_H_
 
 #include <map>
 #include <vector>
@@ -336,4 +336,4 @@ class State
   Eigen::VectorXd mDesiredJointPositionsBalance;
 };
 
-#endif  // APPS_ATLASROBOT_STATE_H_
+#endif  // EXAMPLES_ATLASSIMBICON_STATE_H_
diff --git a/apps/atlasSimbicon/StateMachine.cpp → examples/atlasSimbicon/StateMachine.cpp b/apps/atlasSimbicon/StateMachine.cpp → examples/atlasSimbicon/StateMachine.cpp
@@ -34,9 +34,9 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "apps/atlasSimbicon/StateMachine.h"
+#include "examples/atlasSimbicon/StateMachine.h"
 
-#include "apps/atlasSimbicon/State.h"
+#include "examples/atlasSimbicon/State.h"
 
 // Macro for functions not implemented yet
 #define NOT_YET(FUNCTION) std::cout << #FUNCTION\

diff --git a/apps/atlasSimbicon/StateMachine.h → examples/atlasSimbicon/StateMachine.h b/apps/atlasSimbicon/StateMachine.h → examples/atlasSimbicon/StateMachine.h
@@ -34,8 +34,8 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef APPS_ATLASROBOT_STATEMACHINE_H_
-#define APPS_ATLASROBOT_STATEMACHINE_H_
+#ifndef EXAMPLES_ATLASSIMBICON_STATEMACHINE_H_
+#define EXAMPLES_ATLASSIMBICON_STATEMACHINE_H_
 
 #include <vector>
 #include <string>
@@ -129,4 +129,4 @@ class StateMachine
   State* _findState(const std::string& _name) const;
 };
 
-#endif  // APPS_ATLASROBOT_STATEMACHINE_H_
+#endif  // EXAMPLES_ATLASSIMBICON_STATEMACHINE_H_
diff --git a/apps/atlasSimbicon/TerminalCondition.cpp → examples/atlasSimbicon/TerminalCondition.cpp b/apps/atlasSimbicon/TerminalCondition.cpp → examples/atlasSimbicon/TerminalCondition.cpp
@@ -34,9 +34,9 @@
  *   POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "apps/atlasSimbicon/TerminalCondition.h"
+#include "examples/atlasSimbicon/TerminalCondition.h"
 
-#include "apps/atlasSimbicon/State.h"
+#include "examples/atlasSimbicon/State.h"
 
 // Macro for functions not implemented yet
 #define NOT_YET(FUNCTION) std::cout << #FUNCTION\