From ad638a9cbc1f2559764c0795816a6ca580369f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillem=20Aleny=C3=A0=20Ribas?= <galenya@iri.upc.edu>
Date: Mon, 16 Apr 2012 09:40:17 +0000
Subject: [PATCH] CMake changes for oneiric
---
src/CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 830e2d7..26b8992 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,6 +5,8 @@ SET(sources dynamixel_motor.cpp dynamixel_motor_group.cpp dynamixel_motor_except
# edit the following line to add all the header files of the library
SET(headers dynamixel_motor.h dynamixel_motor_group.h dynamixel_motor_exceptions.h)
+FIND_PACKAGE(iriutils REQUIRED)
+
FIND_PACKAGE(comm REQUIRED)
FIND_PACKAGE(dynamixel REQUIRED)
@@ -12,14 +14,14 @@ FIND_PACKAGE(dynamixel REQUIRED)
FIND_PACKAGE(motor_control REQUIRED)
# edit the following line to add the necessary include directories
-INCLUDE_DIRECTORIES(${comm_INCLUDE_DIR} ${dynamixel_INCLUDE_DIR} ${motor_control_INCLUDE_DIR} .)
+INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIR} ${comm_INCLUDE_DIR} ${dynamixel_INCLUDE_DIR} ${motor_control_INCLUDE_DIR} .)
SET_SOURCE_FILES_PROPERTIES(${XSD_SOURCES} PROPERTIES GENERATED 1)
ADD_LIBRARY(dynamixel_motor_cont SHARED ${sources} ${XSD_SOURCES})
#edit the following line to add the necessary system libraries (if any)
-TARGET_LINK_LIBRARIES(dynamixel_motor_cont ${comm_LIBRARY} ${dynamixel_LIBRARY} ${motor_control_LIBRARY} ${XSD_LIBRARY})
+TARGET_LINK_LIBRARIES(dynamixel_motor_cont ${iriutils_LIBRARY} ${comm_LIBRARY} ${dynamixel_LIBRARY} ${motor_control_LIBRARY} ${XSD_LIBRARY})
ADD_DEPENDENCIES(dynamixel_motor_cont xsd_files_gen)
--
GitLab