From 7985d47d827b13a7475dca3704fc49adcca72a4c Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sat, 2 Apr 2022 11:31:07 +1000 Subject: [PATCH 1/3] Fix prbt_ikfast win compilation --- .../prbt_ikfast_manipulator_plugin/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt b/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt index ee7e2d0bd5..08603019e7 100644 --- a/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt +++ b/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt @@ -4,10 +4,12 @@ project(moveit_resources_prbt_ikfast_manipulator_plugin) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_EXTENSIONS OFF) -add_compile_options(-Wall) -add_compile_options(-Wextra) -add_compile_options(-Wno-unused-parameter) -add_compile_options(-Wno-unused-variable) +if(NOT WIN32) + add_compile_options(-Wall) + add_compile_options(-Wextra) + add_compile_options(-Wno-unused-parameter) + add_compile_options(-Wno-unused-variable) +endif() # enable aligned new in gcc7+ if(CMAKE_COMPILER_IS_GNUCXX) From a5d2e03572de749d8c4804e728216c5bcd903202 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sat, 2 Apr 2022 14:00:55 +1000 Subject: [PATCH 2/3] Another instance --- .../prbt_ikfast_manipulator_plugin/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt b/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt index 08603019e7..a84887f89a 100644 --- a/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt +++ b/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt @@ -31,8 +31,11 @@ include_directories(include) add_library(prbt_manipulator_moveit_ikfast_plugin SHARED src/prbt_manipulator_ikfast_moveit_plugin.cpp) -# suppress warnings about unused variables in OpenRave's solver code -target_compile_options(prbt_manipulator_moveit_ikfast_plugin PRIVATE -Wno-unused-variable) + +if(NOT WIN32) + # suppress warnings about unused variables in OpenRave's solver code + target_compile_options(prbt_manipulator_moveit_ikfast_plugin PRIVATE -Wno-unused-variable) +ending() ament_target_dependencies(prbt_manipulator_moveit_ikfast_plugin moveit_core pluginlib From dedf5e3868714e91bdbe660e6f0118d0250a6ffc Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sat, 2 Apr 2022 15:15:36 +1000 Subject: [PATCH 3/3] Autocorrect --- .../test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt b/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt index a84887f89a..3349523adc 100644 --- a/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt +++ b/moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt @@ -35,7 +35,7 @@ add_library(prbt_manipulator_moveit_ikfast_plugin SHARED if(NOT WIN32) # suppress warnings about unused variables in OpenRave's solver code target_compile_options(prbt_manipulator_moveit_ikfast_plugin PRIVATE -Wno-unused-variable) -ending() +endif() ament_target_dependencies(prbt_manipulator_moveit_ikfast_plugin moveit_core pluginlib