Skip to content
Snippets Groups Projects
Commit a59a2ad6 authored by Florian Walch's avatar Florian Walch
Browse files

Merge pull request #52 in SWDEV/franka_ros from optional-clang-tools to kinetic-devel 

* commit '4aefab6c':
  Update changelog and version
  CMake: Do not depend on ClangTools
parents 5177a6ff 4aefab6c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 86 additions and 72 deletions
CHANGELOG.md
+ 4
− 0
View file @ a59a2ad6
# CHANGELOG
## 0.1.2 - UNRELEASED
* Fixed out-of-workspace build
## 0.1.1 - 2017-10-09
* Integrated `franka_description` as subdirectory
......
franka_control/CMakeLists.txt
+ 15
− 13
View file @ a59a2ad6
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
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
)
include(ClangTools)
add_format_target(franka_control FILES ${SOURCES} ${HEADERS})
add_tidy_target(franka_control
FILES ${SOURCES}
DEPENDS franka_control_node franka_state_controller
)
endif()
franka_control/package.xml
+ 1
− 1
View file @ a59a2ad6
<?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>
......
franka_description/package.xml
+ 1
− 1
View file @ a59a2ad6
<?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>
......
franka_example_controllers/CMakeLists.txt
+ 14
− 12
View file @ a59a2ad6
......@@ -65,16 +65,18 @@ install(FILES franka_example_controllers_plugin.xml
)
## Tools
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
)
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
)
endif()
franka_example_controllers/package.xml
+ 1
− 1
View file @ a59a2ad6
<?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>
......
franka_gripper/CMakeLists.txt
+ 15
− 13
View file @ a59a2ad6
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
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
)
include(ClangTools)
add_format_target(franka_gripper FILES ${SOURCES} ${HEADERS})
add_tidy_target(franka_gripper
FILES ${SOURCES}
DEPENDS franka_gripper franka_gripper_node
)
endif()
franka_gripper/package.xml
+ 1
− 1
View file @ a59a2ad6
<?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>
......
franka_hw/CMakeLists.txt
+ 14
− 12
View file @ a59a2ad6
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
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
)
include(ClangTools)
add_format_target(franka_hw FILES ${SOURCES} ${HEADERS})
add_tidy_target(franka_hw
FILES ${SOURCES}
DEPENDS franka_hw
)
endif()
franka_hw/package.xml
+ 1
− 1
View file @ a59a2ad6
<?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>
......
franka_msgs/package.xml
+ 1
− 1
View file @ a59a2ad6
<?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>
......
franka_ros/package.xml
+ 1
− 1
View file @ a59a2ad6
<?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>
......
franka_visualization/CMakeLists.txt
+ 15
− 13
View file @ a59a2ad6
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
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
)
include(ClangTools)
add_format_target(franka_visualization FILES ${SOURCES} ${HEADERS})
add_tidy_target(franka_visualization
FILES ${SOURCES}
DEPENDS franka_joint_state_publisher
)
endif()
franka_visualization/package.xml
+ 1
− 1
View file @ a59a2ad6
<?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>
......
panda_moveit_config/package.xml
+ 1
− 1
View file @ a59a2ad6
<?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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment