From 81943089f2b24c6456a230bc503ca17aa80ad5df Mon Sep 17 00:00:00 2001 From: Alejandro Lopez Gestoso <alopez@iri.upc.edu> Date: Tue, 26 Feb 2019 11:31:55 +0100 Subject: [PATCH] Modified the necessary files to save the headers, the library and all the related files on the subdirectory iri/<package_name> --- Findptu_d46.cmake | 4 ++-- src/CMakeLists.txt | 6 +++--- src/xml/CMakeLists.txt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Findptu_d46.cmake b/Findptu_d46.cmake index b682c22..be62e87 100755 --- a/Findptu_d46.cmake +++ b/Findptu_d46.cmake @@ -1,9 +1,9 @@ #edit the following line to add the librarie's header files -FIND_PATH(ptu_d46_INCLUDE_DIR ptu_commands.h ptu_d46.h /usr/include/iridrivers /usr/local/include/iridrivers) +FIND_PATH(ptu_d46_INCLUDE_DIR ptu_commands.h ptu_d46.h /usr/include/iri/ptu_d46 /usr/local/include/iri/ptu_d46) FIND_LIBRARY(ptu_d46_LIBRARY NAMES ptu_d46 - PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers) + PATHS /usr/lib/iri/ptu_d46 /usr/local/lib /usr/local/lib/iri/ptu_d46) IF (ptu_d46_INCLUDE_DIR AND ptu_d46_LIBRARY) SET(ptu_d46_FOUND TRUE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9f16874..23006c2 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,11 +30,11 @@ TARGET_LINK_LIBRARIES(ptu_d46 ${trajectory_LIBRARY}) INSTALL(TARGETS ptu_d46 RUNTIME DESTINATION bin - LIBRARY DESTINATION lib/iridrivers - ARCHIVE DESTINATION lib/iridrivers + LIBRARY DESTINATION lib/iri/${PROJECT_NAME} + ARCHIVE DESTINATION lib/iri/${PROJECT_NAME} ) -INSTALL(FILES ${headers} DESTINATION include/iridrivers) +INSTALL(FILES ${headers} DESTINATION include/iri/${PROJECT_NAME}) INSTALL(FILES ../Findptu_d46.cmake DESTINATION ${CMAKE_ROOT}/Modules/) diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index 20a3d78..a98246a 100755 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -39,8 +39,8 @@ IF(XSD_FOUND) DEPENDS ${XSD_PATH_FILES} COMMENT "Parsing the xml template file ${XSD_FILES}") - INSTALL(FILES ${XSD_PATH_FILES} DESTINATION include/iridrivers/xml) - INSTALL(FILES ${XSD_HEADERS_INT} DESTINATION include/iridrivers/xml) + INSTALL(FILES ${XSD_PATH_FILES} DESTINATION include/iri/${PROJECT_NAME}/xml) + INSTALL(FILES ${XSD_HEADERS_INT} DESTINATION include/iri/${PROJECT_NAME}/xml) ENDIF(XSD_FILES) ENDIF(XSD_FOUND) -- GitLab