From 263d4eef69bba52464a81f1052125a27b1906b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergi=20Hern=C3=A0ndez=20Juan?= <shernand@iri.upc.edu>
Date: Thu, 9 Jan 2014 12:16:17 +0000
Subject: [PATCH] Added the CMakeLists.txt fiel for the metapackage. Solved
some problems in the CMakeLists.txt file in the iri_base_driver package.
---
CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f5b535..4ae30ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,9 @@ find_package(catkin REQUIRED)
# find_package(Boost REQUIRED COMPONENTS system)
# edit the following line to add all the source code files of the library
-SET(sources ./src/iri_base_driver.cpp)
+SET(sources src/iri_base_driver.cpp)
# edit the following line to add all the header files of the library
-SET(headers ./include/iri_base_driver.h ./include/iri_base_driver_node.h)
+SET(headers include/${PROJECT_NAME}/iri_base_driver.h include/${PROJECT_NAME}/iri_base_driver_node.h)
## Uncomment this if the package has a setup.py. This macro ensures
## modules and global scripts declared therein get installed
@@ -82,7 +82,7 @@ SET(headers ./include/iri_base_driver.h ./include/iri_base_driver_node.h)
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
- INCLUDE_DIRS ${headers}
+ INCLUDE_DIRS include
# LIBRARIES foo
# CATKIN_DEPENDS other_catkin_pkg
# DEPENDS system_lib
@@ -95,7 +95,7 @@ catkin_package(
## Specify additional locations of header files
## Your package locations should be listed before other locations
# include_directories(include)
-INCLUDE_DIRECTORIES(${headers})
+INCLUDE_DIRECTORIES(include)
## Declare a cpp library
# add_library(foo
--
GitLab