From 6d12ff2178c1a2e255d087e73c6fa8dbd790989b Mon Sep 17 00:00:00 2001 From: Alopez <alopez@iri.upc.edu> Date: Tue, 2 Jul 2019 11:43:26 +0200 Subject: [PATCH] Adapted to the new installation directories --- Findbno055_imu_driver.cmake | 6 +++--- src/CMakeLists.txt | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Findbno055_imu_driver.cmake b/Findbno055_imu_driver.cmake index 40517e1..cd0f15d 100644 --- a/Findbno055_imu_driver.cmake +++ b/Findbno055_imu_driver.cmake @@ -1,13 +1,13 @@ #edit the following line to add the librarie's header files -FIND_PATH(bno055_imu_driver_INCLUDE_DIR bno055_imu_driver.h bno055_imu_exceptions.h bno055_common.h bno055_imu_sim.h /usr/include/iridrivers /usr/local/include/iridrivers) +FIND_PATH(bno055_imu_driver_INCLUDE_DIR bno055_imu_driver.h bno055_imu_exceptions.h bno055_common.h bno055_imu_sim.h /usr/local/include/iri/bno055_imu /usr/include/iri/bno055_imu) FIND_LIBRARY(bno055_imu_driver_LIBRARY_aux NAMES bno055_imu_driver - PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers) + PATHS /usr/local/lib/iri/bno055_imu /usr/lib/iri/bno055_imu) FIND_LIBRARY(bno055_imu_sim_LIBRARY_aux NAMES bno055_imu_sim - PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers) + PATHS /usr/local/lib/iri/bno055_imu /usr/lib/iri/bno055_imu) IF (bno055_imu_driver_LIBRARY_aux AND bno055_imu_sim_LIBRARY_aux) SET(bno055_imu_driver_LIBRARY ${bno055_imu_driver_LIBRARY_aux} ${bno055_imu_sim_LIBRARY_aux}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 250db8e..2a7c843 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,14 +27,14 @@ TARGET_LINK_LIBRARIES(bno055_imu_sim ${comm_LIBRARY}) INSTALL(TARGETS bno055_imu_driver RUNTIME DESTINATION bin - LIBRARY DESTINATION lib/iridrivers - ARCHIVE DESTINATION lib/iridrivers) -INSTALL(FILES ${headers} DESTINATION include/iridrivers) + LIBRARY DESTINATION lib/iri/${PROJECT_NAME} + ARCHIVE DESTINATION lib/iri/${PROJECT_NAME}) +INSTALL(FILES ${headers} DESTINATION include/iri/${PROJECT_NAME}) INSTALL(TARGETS bno055_imu_sim RUNTIME DESTINATION bin - LIBRARY DESTINATION lib/iridrivers - ARCHIVE DESTINATION lib/iridrivers) -INSTALL(FILES ${headers_sim} DESTINATION include/iridrivers) + LIBRARY DESTINATION lib/iri/${PROJECT_NAME} + ARCHIVE DESTINATION lib/iri/${PROJECT_NAME}) +INSTALL(FILES ${headers_sim} DESTINATION include/iri/${PROJECT_NAME}) INSTALL(FILES ../Findbno055_imu_driver.cmake DESTINATION ${CMAKE_ROOT}/Modules/) ADD_SUBDIRECTORY(examples) -- GitLab