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
Stack Of Tasks
roscontrol_sot
Commits
6bb5dcd1
Commit
6bb5dcd1
authored
Mar 12, 2020
by
Guilhem Saurel
Browse files
[CMake] keep legacy lib name
parent
e2dad270
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
6bb5dcd1
...
...
@@ -66,21 +66,21 @@ if(temperature_sensor_controller_FOUND)
add_definitions
(
-DTEMPERATURE_SENSOR_CONTROLLER
)
endif
(
temperature_sensor_controller_FOUND
)
add_library
(
${
PROJECT_NAME
}
add_library
(
rcsot_controller
src/roscontrol-sot-controller.cpp
src/log.cpp
)
TARGET_INCLUDE_DIRECTORIES
(
${
PROJECT_NAME
}
SYSTEM PUBLIC
${
catkin_INCLUDE_DIRS
}
)
TARGET_INCLUDE_DIRECTORIES
(
${
PROJECT_NAME
}
PUBLIC $<INSTALL_INTERFACE:include>
)
TARGET_LINK_LIBRARIES
(
${
PROJECT_NAME
}
${
catkin_LIBRARIES
}
${
bullet_LIBRARIES
}
sot-core::sot-core dynamic_g
r
aph_bridge::sot_loader
)
TARGET_INCLUDE_DIRECTORIES
(
rcsot_controller
SYSTEM PUBLIC
${
catkin_INCLUDE_DIRS
}
)
TARGET_INCLUDE_DIRECTORIES
(
rcsot_controller
PUBLIC $<INSTALL_INTERFACE:include>
)
TARGET_LINK_LIBRARIES
(
rcsot_controller
${
catkin_LIBRARIES
}
${
bullet_LIBRARIES
}
sot-core::sot-core dynamic_ga
r
ph_bridge::sot_loader
)
IF
(
SUFFIX_SO_VERSION
)
SET_TARGET_PROPERTIES
(
${
PROJECT_NAME
}
PROPERTIES SOVERSION
${
PROJECT_VERSION
}
)
SET_TARGET_PROPERTIES
(
rcsot_controller
PROPERTIES SOVERSION
${
PROJECT_VERSION
}
)
ENDIF
(
SUFFIX_SO_VERSION
)
IF
(
NOT INSTALL_PYTHON_INTERFACE_ONLY
)
INSTALL
(
TARGETS
${
PROJECT_NAME
}
EXPORT
${
TARGETS_EXPORT_NAME
}
DESTINATION lib
)
INSTALL
(
TARGETS
rcsot_controller
EXPORT
${
TARGETS_EXPORT_NAME
}
DESTINATION lib
)
ENDIF
(
NOT INSTALL_PYTHON_INTERFACE_ONLY
)
ADD_EXECUTABLE
(
roscontrol-sot-parse-log src/roscontrol-sot-parse-log.cc
)
...
...
tests/CMakeLists.txt
View file @
6bb5dcd1
...
...
@@ -6,7 +6,7 @@
ADD_EXECUTABLE
(
roscontrol_sot_hardware roscontrol_sot_hardware.cpp
)
TARGET_INCLUDE_DIRECTORIES
(
roscontrol_sot_hardware PRIVATE
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
>
)
TARGET_LINK_LIBRARIES
(
roscontrol_sot_hardware
${
PROJECT_NAME
}
TARGET_LINK_LIBRARIES
(
roscontrol_sot_hardware
rcsot_controller
${
catkin_LIBRARIES
}
${
bullet_libraries
}
)
# Add the library to wrap the test device.
...
...
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