diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a5fcf6706d70c3edd24c064870b0c28d8770992..151f04509261826da6d5079254249bad8d0a8f2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 0.1.2 - UNRELEASED + + * Fixed out-of-workspace build + ## 0.1.1 - 2017-10-09 * Integrated `franka_description` as subdirectory diff --git a/franka_control/CMakeLists.txt b/franka_control/CMakeLists.txt index 1619f28e5f71b03b1b1c4c9d867f59d492363a89..7b47fdde3a4366437d5a71d2eabe91666fcef1c4 100644 --- a/franka_control/CMakeLists.txt +++ b/franka_control/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 2.8.3) project(franka_control) -list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) - set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -142,14 +140,18 @@ install(FILES franka_controller_plugins.xml ) ## Tools -file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) -file(GLOB_RECURSE HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h -) -include(ClangTools) -add_format_target(franka_control FILES ${SOURCES} ${HEADERS}) -add_tidy_target(franka_control - FILES ${SOURCES} - DEPENDS franka_control_node franka_state_controller -) +include(${CMAKE_CURRENT_LIST_DIR}/../cmake/ClangTools.cmake OPTIONAL + RESULT_VARIABLE CLANG_TOOLS +) +if(CLANG_TOOLS) + file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) + file(GLOB_RECURSE HEADERS + ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h + ) + add_format_target(franka_control FILES ${SOURCES} ${HEADERS}) + add_tidy_target(franka_control + FILES ${SOURCES} + DEPENDS franka_control_node franka_state_controller + ) +endif() diff --git a/franka_control/package.xml b/franka_control/package.xml index e4937458ce7b38ea708d18d5ac37d5760d6cf858..722c4e6111aebc8023c2f7bb8971f5ba6e9a0f2c 100644 --- a/franka_control/package.xml +++ b/franka_control/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <package format="2"> <name>franka_control</name> - <version>0.1.1</version> + <version>0.1.2</version> <description>franka_control provides a hardware node to control a Franka Emika research robot</description> <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>Apache 2.0</license> diff --git a/franka_description/package.xml b/franka_description/package.xml index 03c970ad5999570c3fd39a4031dbe760129f943d..de1697bf316bb7ab48788b771211bca525b1eba2 100644 --- a/franka_description/package.xml +++ b/franka_description/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <package format="2"> <name>franka_description</name> - <version>0.1.1</version> + <version>0.1.2</version> <description>franka_description contains URDF files and meshes of Franka Emika robots</description> <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>Apache 2.0</license> diff --git a/franka_example_controllers/CMakeLists.txt b/franka_example_controllers/CMakeLists.txt index 31f665a58f0445503580bc3ae867e571b1446e82..ce69de01d1372f3239e354d98b84cf1fe66dd7ac 100644 --- a/franka_example_controllers/CMakeLists.txt +++ b/franka_example_controllers/CMakeLists.txt @@ -65,16 +65,18 @@ install(FILES franka_example_controllers_plugin.xml ) ## Tools -file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) -file(GLOB_RECURSE HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h -) - -list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) -include(ClangTools) -add_format_target(franka_example_controllers FILES ${SOURCES} ${HEADERS}) -add_tidy_target(franka_example_controllers - FILES ${SOURCES} - DEPENDS franka_example_controllers +include(${CMAKE_CURRENT_LIST_DIR}/../cmake/ClangTools.cmake OPTIONAL + RESULT_VARIABLE CLANG_TOOLS ) +if(CLANG_TOOLS) + file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) + file(GLOB_RECURSE HEADERS + ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h + ) + add_format_target(franka_example_controllers FILES ${SOURCES} ${HEADERS}) + add_tidy_target(franka_example_controllers + FILES ${SOURCES} + DEPENDS franka_example_controllers + ) +endif() diff --git a/franka_example_controllers/package.xml b/franka_example_controllers/package.xml index cab14e4e720210fad1f32e32292419a28505f435..e816cb637b6bf4e7d6a3a0f7cc42bc1f268c619f 100644 --- a/franka_example_controllers/package.xml +++ b/franka_example_controllers/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <package format="2"> <name>franka_example_controllers</name> - <version>0.1.1</version> + <version>0.1.2</version> <description>The franka_example_controllers package</description> <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>Apache 2.0</license> diff --git a/franka_gripper/CMakeLists.txt b/franka_gripper/CMakeLists.txt index 58e3677544bf4f1a4d244150219a594f92aeb9d1..c93a498e04426d7966ba8c03fbfc651b3966de63 100644 --- a/franka_gripper/CMakeLists.txt +++ b/franka_gripper/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 2.8.3) project(franka_gripper) -list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) - set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -99,14 +97,18 @@ install(DIRECTORY config ) ## Tools -file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) -file(GLOB_RECURSE HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h -) -include(ClangTools) -add_format_target(franka_gripper FILES ${SOURCES} ${HEADERS}) -add_tidy_target(franka_gripper - FILES ${SOURCES} - DEPENDS franka_gripper franka_gripper_node -) +include(${CMAKE_CURRENT_LIST_DIR}/../cmake/ClangTools.cmake OPTIONAL + RESULT_VARIABLE CLANG_TOOLS +) +if(CLANG_TOOLS) + file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) + file(GLOB_RECURSE HEADERS + ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h + ) + add_format_target(franka_gripper FILES ${SOURCES} ${HEADERS}) + add_tidy_target(franka_gripper + FILES ${SOURCES} + DEPENDS franka_gripper franka_gripper_node + ) +endif() diff --git a/franka_gripper/package.xml b/franka_gripper/package.xml index eb41a2cbf7a310460240cab82bc970c8f625029c..cb3172ce2069ebcd98bdc3605b4891fa12efbde0 100644 --- a/franka_gripper/package.xml +++ b/franka_gripper/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <package format="2"> <name>franka_gripper</name> - <version>0.1.1</version> + <version>0.1.2</version> <description>This package implements the franka gripper of type Franka Hand for the use in ros</description> <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>Apache 2.0</license> diff --git a/franka_hw/CMakeLists.txt b/franka_hw/CMakeLists.txt index 3d5c68a96f50da18f9f23626549e937292b1c8ed..cefe07ca06b343491f229805de7aa55445f37cfb 100644 --- a/franka_hw/CMakeLists.txt +++ b/franka_hw/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 2.8.3) project(franka_hw) -list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) - set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -60,14 +58,18 @@ if(CATKIN_ENABLE_TESTING) endif() ## Tools -file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) -file(GLOB_RECURSE HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h -) -include(ClangTools) -add_format_target(franka_hw FILES ${SOURCES} ${HEADERS}) -add_tidy_target(franka_hw - FILES ${SOURCES} - DEPENDS franka_hw +include(${CMAKE_CURRENT_LIST_DIR}/../cmake/ClangTools.cmake OPTIONAL + RESULT_VARIABLE CLANG_TOOLS ) +if(CLANG_TOOLS) + file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) + file(GLOB_RECURSE HEADERS + ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h + ) + add_format_target(franka_hw FILES ${SOURCES} ${HEADERS}) + add_tidy_target(franka_hw + FILES ${SOURCES} + DEPENDS franka_hw + ) +endif() diff --git a/franka_hw/package.xml b/franka_hw/package.xml index d86c12d0b008ac658cd887470119058dd83b5427..e99de449899c66502a420b6b18422e707d4dd15c 100644 --- a/franka_hw/package.xml +++ b/franka_hw/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <package format="2"> <name>franka_hw</name> - <version>0.1.1</version> + <version>0.1.2</version> <description>franka_hw provides hardware interfaces for using Franka Emika research robots with ros_control</description> <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>Apache 2.0</license> diff --git a/franka_msgs/package.xml b/franka_msgs/package.xml index fcfb412cc1ae4d4ed1a8c15a7a887d09d7df5d1a..1678165f5d0fe6ef795f69726b794c176bdc18e4 100644 --- a/franka_msgs/package.xml +++ b/franka_msgs/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <package format="2"> <name>franka_msgs</name> - <version>0.1.1</version> + <version>0.1.2</version> <description>franka_msgs provides messages specific to Franka Emika research robots</description> <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>Apache 2.0</license> diff --git a/franka_ros/package.xml b/franka_ros/package.xml index f6552f2be588dd02ba1c8b27cb6c54abbfff1172..dbcb9b0d15d82062d68abb36f89f82a5cb973c91 100644 --- a/franka_ros/package.xml +++ b/franka_ros/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <package format="2"> <name>franka_ros</name> - <version>0.1.1</version> + <version>0.1.2</version> <description>franka_ros is a metapackage for all Franka Emika ROS packages</description> <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>Apache 2.0</license> diff --git a/franka_visualization/CMakeLists.txt b/franka_visualization/CMakeLists.txt index 5188fc6f1acba9db30bcefde78bb30e181d5d2d0..e5ffe18fb13347b25d9b40def072cfe7e5cd2389 100644 --- a/franka_visualization/CMakeLists.txt +++ b/franka_visualization/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 2.8.3) project(franka_visualization) -list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) - set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -44,14 +42,18 @@ install(DIRECTORY config ) ## Tools -file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) -file(GLOB_RECURSE HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h -) -include(ClangTools) -add_format_target(franka_visualization FILES ${SOURCES} ${HEADERS}) -add_tidy_target(franka_visualization - FILES ${SOURCES} - DEPENDS franka_joint_state_publisher -) +include(${CMAKE_CURRENT_LIST_DIR}/../cmake/ClangTools.cmake OPTIONAL + RESULT_VARIABLE CLANG_TOOLS +) +if(CLANG_TOOLS) + file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) + file(GLOB_RECURSE HEADERS + ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h + ) + add_format_target(franka_visualization FILES ${SOURCES} ${HEADERS}) + add_tidy_target(franka_visualization + FILES ${SOURCES} + DEPENDS franka_joint_state_publisher + ) +endif() diff --git a/franka_visualization/package.xml b/franka_visualization/package.xml index 413cb216dc53be7f63c9ccf61b037f61d6ac45d6..3228bce5d2f612b0a6fbf60352c6ec4695bc4668 100644 --- a/franka_visualization/package.xml +++ b/franka_visualization/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <package format="2"> <name>franka_visualization</name> - <version>0.1.1</version> + <version>0.1.2</version> <description>This package contains visualization tools for Franka Emika.</description> <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>Apache 2.0</license> diff --git a/panda_moveit_config/package.xml b/panda_moveit_config/package.xml index b28e0d4982304411a27da4294f24d78b49bfa038..1bde43b9ffaff446444786a79dce2396289f35c8 100644 --- a/panda_moveit_config/package.xml +++ b/panda_moveit_config/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <package format="2"> <name>panda_moveit_config</name> - <version>0.1.1</version> + <version>0.1.2</version> <description> A partly automatically generated package with all the configuration and launch files for using Panda research with MoveIt!</description> <maintainer email="info@franka.de">Franka Emika GmbH</maintainer> <license>Apache 2.0</license>