Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Paul Rouanet
ros2_control_bolt
Commits
85450cc5
Unverified
Commit
85450cc5
authored
May 11, 2020
by
Denis Štogl
Committed by
GitHub
May 11, 2020
Browse files
Merge pull request #18 from ros-controls/clean_cmake
Clean cmake
parent
fa923ace
Changes
9
Hide whitespace changes
Inline
Side-by-side
.github/workflows/linters.yaml
View file @
85450cc5
name
:
Linters
on
:
pull_request
:
push
:
branches
:
-
master
jobs
:
ament_copyright
:
...
...
ros2_control_demo_communication_gazebo/CMakeLists.txt
View file @
85450cc5
...
...
@@ -11,10 +11,6 @@ if(NOT CMAKE_CXX_STANDARD)
set
(
CMAKE_CXX_STANDARD 14
)
endif
()
if
(
CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES
"Clang"
)
add_compile_options
(
-Wall -Wextra -Wpedantic
)
endif
()
# find dependencies
find_package
(
ament_cmake REQUIRED
)
...
...
@@ -22,12 +18,12 @@ install(DIRECTORY include/
DESTINATION include
)
if
(
BUILD_TESTING
)
find_package
(
ament_lint_auto REQUIRED
)
ament_lint_auto_find_test_dependencies
()
find_package
(
ament_cmake_gtest REQUIRED
)
ament_add_gtest
(
test_dummy test/test_dummy.cpp
)
target_include_directories
(
test_dummy PRIVATE include
)
# ament_target_dependencies(test_dummy rcpputils)
endif
()
ament_export_libraries
(
${
PROJECT_NAME
}
)
...
...
ros2_control_demo_communication_gazebo/package.xml
View file @
85450cc5
...
...
@@ -13,8 +13,6 @@
<buildtool_depend>
ament_cmake
</buildtool_depend>
<test_depend>
ament_cmake_gtest
</test_depend>
<test_depend>
ament_lint_auto
</test_depend>
<test_depend>
ament_lint_common
</test_depend>
<export>
<build_type>
ament_cmake
</build_type>
...
...
ros2_control_demo_communication_headless/CMakeLists.txt
View file @
85450cc5
...
...
@@ -11,10 +11,6 @@ if(NOT CMAKE_CXX_STANDARD)
set
(
CMAKE_CXX_STANDARD 14
)
endif
()
if
(
CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES
"Clang"
)
add_compile_options
(
-Wall -Wextra -Wpedantic
)
endif
()
# find dependencies
find_package
(
ament_cmake REQUIRED
)
...
...
@@ -22,12 +18,12 @@ install(DIRECTORY include/
DESTINATION include
)
if
(
BUILD_TESTING
)
find_package
(
ament_lint_auto REQUIRED
)
ament_lint_auto_find_test_dependencies
()
find_package
(
ament_cmake_gtest REQUIRED
)
ament_add_gtest
(
test_dummy test/test_dummy.cpp
)
target_include_directories
(
test_dummy PRIVATE include
)
# ament_target_dependencies(test_dummy rcpputils)
endif
()
ament_export_libraries
(
${
PROJECT_NAME
}
)
...
...
ros2_control_demo_communication_headless/package.xml
View file @
85450cc5
...
...
@@ -13,8 +13,6 @@
<buildtool_depend>
ament_cmake
</buildtool_depend>
<test_depend>
ament_cmake_gtest
</test_depend>
<test_depend>
ament_lint_auto
</test_depend>
<test_depend>
ament_lint_common
</test_depend>
<export>
<build_type>
ament_cmake
</build_type>
...
...
ros2_control_demo_hardware/CMakeLists.txt
View file @
85450cc5
...
...
@@ -11,10 +11,6 @@ if(NOT CMAKE_CXX_STANDARD)
set
(
CMAKE_CXX_STANDARD 14
)
endif
()
if
(
CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES
"Clang"
)
add_compile_options
(
-Wall -Wextra -Wpedantic
)
endif
()
# find dependencies
find_package
(
ament_cmake REQUIRED
)
...
...
@@ -22,12 +18,12 @@ install(DIRECTORY include/
DESTINATION include
)
if
(
BUILD_TESTING
)
find_package
(
ament_lint_auto REQUIRED
)
ament_lint_auto_find_test_dependencies
()
find_package
(
ament_cmake_gtest REQUIRED
)
ament_add_gtest
(
test_dummy test/test_dummy.cpp
)
target_include_directories
(
test_dummy PRIVATE include
)
# ament_target_dependencies(test_dummy rcpputils)
endif
()
ament_export_libraries
(
${
PROJECT_NAME
}
)
...
...
ros2_control_demo_hardware/package.xml
View file @
85450cc5
...
...
@@ -13,8 +13,6 @@
<buildtool_depend>
ament_cmake
</buildtool_depend>
<test_depend>
ament_cmake_gtest
</test_depend>
<test_depend>
ament_lint_auto
</test_depend>
<test_depend>
ament_lint_common
</test_depend>
<export>
<build_type>
ament_cmake
</build_type>
...
...
ros2_control_demo_robot/CMakeLists.txt
View file @
85450cc5
...
...
@@ -11,10 +11,6 @@ if(NOT CMAKE_CXX_STANDARD)
set
(
CMAKE_CXX_STANDARD 14
)
endif
()
if
(
CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES
"Clang"
)
add_compile_options
(
-Wall -Wextra -Wpedantic
)
endif
()
# find dependencies
find_package
(
ament_cmake REQUIRED
)
...
...
@@ -22,12 +18,12 @@ install(DIRECTORY config/ description/ launch/
DESTINATION share
)
if
(
BUILD_TESTING
)
find_package
(
ament_lint_auto REQUIRED
)
ament_lint_auto_find_test_dependencies
()
find_package
(
ament_cmake_gtest REQUIRED
)
ament_add_gtest
(
test_dummy test/test_dummy.cpp
)
target_include_directories
(
test_dummy PRIVATE include
)
# ament_target_dependencies(test_dummy rcpputils)
endif
()
ament_package
()
ros2_control_demo_robot/package.xml
View file @
85450cc5
...
...
@@ -13,8 +13,6 @@
<buildtool_depend>
ament_cmake
</buildtool_depend>
<test_depend>
ament_cmake_gtest
</test_depend>
<test_depend>
ament_lint_auto
</test_depend>
<test_depend>
ament_lint_common
</test_depend>
<export>
<build_type>
ament_cmake
</build_type>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment