Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
emros-ros
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
nathan
emros-ros
Commits
803c0b21
Commit
803c0b21
authored
Apr 06, 2018
by
Sydney Speckle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing dependencies
parent
6335ab9a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
5 deletions
+7
-5
CMakeLists.txt
emros_basecontroller/CMakeLists.txt
+2
-1
emros_common
emros_common
+1
-1
CMakeLists.txt
emros_dispatcher/CMakeLists.txt
+3
-2
package.xml
emros_dispatcher/package.xml
+1
-1
No files found.
emros_basecontroller/CMakeLists.txt
View file @
803c0b21
...
...
@@ -124,7 +124,8 @@ CATKIN_DEPENDS message_runtime
## Your package locations should be listed before other locations
include_directories
(
include
../emros_common_code/inc
../emros_common/inc
../utility_ofc/inc
${
catkin_INCLUDE_DIRS
}
)
...
...
emros_common
@
309c068f
Subproject commit
4abe5d5b1d6ef8552ef6f4c5bfdd9e0ec04b5b93
Subproject commit
309c068ff4c0fefd794489caf57cbb7664f9ae9a
emros_dispatcher/CMakeLists.txt
View file @
803c0b21
...
...
@@ -118,11 +118,12 @@ CATKIN_DEPENDS message_runtime std_msgs
## Your package locations should be listed before other locations
include_directories
(
include
../emros_common_code/inc
../utility_ofc/inc
../emros_common/inc
${
catkin_INCLUDE_DIRS
}
)
add_executable
(
dispatcher src/dispatcher.cpp src/udpsocket.cpp ../
emros_common_code/src/ethprotocol.cpp ../emros_common_code
/src/crc16.cpp
)
add_executable
(
dispatcher src/dispatcher.cpp src/udpsocket.cpp ../
utility_ofc/src/ethprotocol.cpp ../utility_ofc
/src/crc16.cpp
)
add_dependencies
(
dispatcher
${${
PROJECT_NAME
}
_EXPORTED_TARGETS
}
${
catkin_EXPORTED_TARGETS
}
)
target_link_libraries
(
dispatcher
${
catkin_LIBRARIES
}
)
...
...
emros_dispatcher/package.xml
View file @
803c0b21
...
...
@@ -42,7 +42,7 @@
<buildtool_depend>
catkin
</buildtool_depend>
<run_depend>
roscpp
</run_depend>
<build_depend>
message_generation
</build_depend>
<build_depend>
emros_common_code
</build_depend>
<build_depend>
utility_ofc
</build_depend>
<run_depend>
message_runtime
</run_depend>
<build_depend>
std_msgs
</build_depend>
<run_depend>
std_msgs
</run_depend>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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