Merge pull request #357 from ms-iot/windows_fix

[Windows][melodic-devel] Fix Windows\MSVC build breaks

Author: v4hn

CMakeLists.txt

@@ -1,7 +1,8 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.1.3)
 project(moveit_tutorials)
 
-add_compile_options(-std=c++14)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 find_package(catkin REQUIRED
   COMPONENTS

doc/interactivity/CMakeLists.txt

@@ -37,6 +37,12 @@ install(
   LIBRARY
   DESTINATION
     ${CATKIN_PACKAGE_LIB_DESTINATION}
+  ARCHIVE
+  DESTINATION
+    ${CATKIN_PACKAGE_LIB_DESTINATION}
+  RUNTIME
+  DESTINATION
+    ${CATKIN_GLOBAL_BIN_DESTINATION}
 )
 
 install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

doc/interactivity/launch/attached_body_tutorial.launch

@@ -1,7 +1,7 @@
 <launch>
 
   <!-- load URDF -->
-  <param name="robot_description" command="$(find xacro)/xacro.py '$(find panda_description)/robots/panda.urdf.xacro'" />
+  <param name="robot_description" command="$(find xacro)/xacro '$(find panda_description)/robots/panda.urdf.xacro'" />
 
   <!-- load SRDF -->
   <param name="robot_description_semantic" textfile="$(find panda_moveit_config)/config/panda.srdf" />

doc/interactivity/launch/interactivity_tutorial.launch

@@ -1,7 +1,7 @@
 <launch>
 
   <!-- load URDF -->
-  <param name="robot_description" command="$(find xacro)/xacro.py '$(find panda_description)/robots/panda.urdf.xacro'" />
+  <param name="robot_description" command="$(find xacro)/xacro '$(find panda_description)/robots/panda.urdf.xacro'" />
 
   <!-- load SRDF -->
   <param name="robot_description_semantic" textfile="$(find panda_moveit_config)/config/panda.srdf" />

doc/interactivity/src/interactive_robot.cpp

@@ -271,6 +271,7 @@ bool InteractiveRobot::setGroupPose(const Eigen::Isometry3d& pose)
 {
   desired_group_end_link_pose_ = pose;
   scheduleUpdate();
+  return true;
 }
 
 /* publish robot pose to rviz */

doc/kinematics/src/ros_api_tutorial.cpp

@@ -64,7 +64,7 @@ int main(int argc, char** argv)
   while (!service_client.exists())
   {
     ROS_INFO("Waiting for service");
-    sleep(1.0);
+    ros::Duration(1.0).sleep();
   }
 
   moveit_msgs::GetPositionIK::Request service_request;