Skip to content
Snippets Groups Projects
Commit ade34e06 authored by Anthony Mallet's avatar Anthony Mallet Committed by Matthieu Herrb
Browse files

[wip/jrl-dynamics-urdf] Remove dandling files

Delete leftover files after commit:1fb3b157
parent 163325e1
No related branches found
No related tags found
No related merge requests found
Add missing roscpp dependency (needed at this level for xmlrcpp)
--- tests/CMakeLists.txt.orig 2014-10-09 07:49:21.080796000 +0200
+++ tests/CMakeLists.txt 2014-10-09 08:05:09.825506000 +0200
@@ -23,4 +23,5 @@
ADD_EXECUTABLE(one_dof_revolute_x one_dof_revolute_x.cpp)
PKG_CONFIG_USE_DEPENDENCY(one_dof_revolute_x jrl-mal)
PKG_CONFIG_USE_DEPENDENCY(one_dof_revolute_x urdfdom_headers)
+PKG_CONFIG_USE_DEPENDENCY(one_dof_revolute_x roscpp)
TARGET_LINK_LIBRARIES(one_dof_revolute_x jrl-dynamics-urdf)
Use cmake's idea of the "make" program, so that it can be tuned by robotpkg
https://github.com/jrl-umi3218/jrl-cmakemodules/issues/34
--- cmake/doxygen.cmake.orig 2014-10-09 08:10:58.628860000 +0200
+++ cmake/doxygen.cmake 2014-10-09 08:11:14.727096000 +0200
@@ -66,7 +66,7 @@
COMMENT "Generating Doxygen documentation"
)
- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${MAKE} doc)")
+ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_MAKE_PROGRAM} doc)")
ENDIF(MSVC)
ADD_CUSTOM_COMMAND(
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment