From 61dc70d7fd1308e571b22c9de398daea37afff94 Mon Sep 17 00:00:00 2001
From: fherrero <fherrero@iri.upc.edu>
Date: Thu, 19 Sep 2019 11:55:51 +0100
Subject: [PATCH] Add gitignore, gitlab ci file, moved headers to include
folder
---
CMakeLists.txt | 4 ++--
{src => include}/segway_RMP400.h | 0
{src => include}/segway_RMP400_exception.h | 0
src/CMakeLists.txt | 22 +++++++++++-----------
4 files changed, 13 insertions(+), 13 deletions(-)
rename {src => include}/segway_RMP400.h (100%)
rename {src => include}/segway_RMP400_exception.h (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da9f297..f75fabb 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 c35ef62..fa4013d 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/)
--
GitLab