Skip to content

Commit c850778

Browse files
author
Olivier Stasse
authored
Merge pull request #6 from olivier-stasse/master
Fix installation procedure
2 parents 835df5b + 0ead5ae commit c850778

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ _build
22
*.user
33
*/*.user
44
.idea
5+
/build/

doc/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/Doxyfile
2+
/Doxyfile.extra

examples/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ macro(_local_test_ddp)
33
set(list_var "${ARGN}")
44
foreach(loop_var IN LISTS list_var)
55
ADD_EXECUTABLE(${loop_var} ${loop_var}.cpp)
6-
TARGET_LINK_LIBRARIES(${loop_var} ${PROJECT_NAME}-examples ${qpOASES_LIBRARIES})
6+
TARGET_LINK_LIBRARIES(${loop_var} ${PROJECT_NAME}-examples
7+
${qpOASES_LIBRARIES})
78
PKG_CONFIG_USE_DEPENDENCY(${loop_var} eigen3)
89
endforeach()
910
endmacro()
@@ -29,7 +30,7 @@ ADD_LIBRARY(${PROJECT_NAME}-examples SHARED ${source_files})
2930
PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME}-examples eigen3)
3031

3132
INSTALL(TARGETS ${PROJECT_NAME}-examples LIBRARY DESTINATION lib)
32-
INSTALL(FILES ${header_files} DESTINATION include)
33+
INSTALL(FILES ${header_files} DESTINATION include/ddp-actuator-solver/examples)
3334

3435
ADD_SUBDIRECTORY(romeo_actuator)
3536
ADD_SUBDIRECTORY(temperature_control)

0 commit comments

Comments
 (0)