diff --git a/CMakeLists.txt b/CMakeLists.txt index da9f297e2e1e91ad17fd25fde9ac42523eb43756..f75fabbf0e9ccb0a3de2b194b59547b7a1d7f16c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ IF (UNIX) # Uncomment to add dependencies comma separated # SET(CPACK_DEBIAN_PACKAGE_DEPENDS "iri-<package_name>-dev (>= 1.0~${DISTRIB})") - SET(CPACK_DEBIAN_PACKAGE_DEPENDS "iri-iriutils-dev (>= 1.0~${DISTRIB}), iri-comm-dev (>= 1.0~${DISTRIB})") + SET(CPACK_DEBIAN_PACKAGE_DEPENDS "iri-iriutils-dev (>= 1.0~${DISTRIB}), iri-comm-dev (>= 1.0~${DISTRIB}), iri-segway-rmp-200 (>= 1.0~${DISTRIB})") INCLUDE(CPack) ELSE(UNIX) @@ -94,4 +94,4 @@ IF (UNIX) COMMENT "packaging only implemented in unix" TARGET uninstall ) - ENDIF(UNIX) \ No newline at end of file + ENDIF(UNIX) diff --git a/src/segway_RMP400.h b/include/segway_RMP400.h similarity index 100% rename from src/segway_RMP400.h rename to include/segway_RMP400.h diff --git a/src/segway_RMP400_exception.h b/include/segway_RMP400_exception.h similarity index 100% rename from src/segway_RMP400_exception.h rename to include/segway_RMP400_exception.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c35ef62e8cff5f3efe1216a62657c126e537edfc..fa4013d1c4723632e475d24320c86bab2a494163 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ # edit the following line to add all the source code files of the library SET(sources segway_RMP400.cpp segway_RMP400_exception.cpp) # edit the following line to add all the header files of the library -SET(headers segway_RMP400.h segway_RMP400_exception.h) +SET(headers ../include/segway_RMP400.h ../include/segway_RMP400_exception.h) # edit the following line to find the necessary packages FIND_PACKAGE(iriutils REQUIRED) @@ -9,25 +9,25 @@ FIND_PACKAGE(comm REQUIRED) FIND_PACKAGE(segway_rmp_200 REQUIRED) # edit the following line to add the necessary include directories -INCLUDE_DIRECTORIES(.) -INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIR}) -INCLUDE_DIRECTORIES(${comm_INCLUDE_DIR}) -INCLUDE_DIRECTORIES(${segway_rmp_200_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(../include) +INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${comm_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${segway_rmp_200_INCLUDE_DIRS}) ADD_LIBRARY(segway_rmp_400 SHARED ${sources}) #edit the following line to add the necessary system libraries (if any) -TARGET_LINK_LIBRARIES(segway_rmp_400 ${iriutils_LIBRARY}) -TARGET_LINK_LIBRARIES(segway_rmp_400 ${comm_LIBRARY}) -TARGET_LINK_LIBRARIES(segway_rmp_400 ${segway_rmp_200_LIBRARY}) +TARGET_LINK_LIBRARIES(segway_rmp_400 ${iriutils_LIBRARIES}) +TARGET_LINK_LIBRARIES(segway_rmp_400 ${comm_LIBRARIES}) +TARGET_LINK_LIBRARIES(segway_rmp_400 ${segway_rmp_200_LIBRARIES}) INSTALL(TARGETS segway_rmp_400 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 ../Findsegway_rmp_400.cmake DESTINATION ${CMAKE_ROOT}/Modules/)