Modified to set and use the trajectory_INCLUDE_DIRS and trajectory_LIBRARIES

Findtrajectory.cmake

 #edit the following line to add the librarie's header files
-FIND_PATH(trajectory_INCLUDE_DIR trajectory.h trajectory_exceptions.h /usr/include/iri/trajectory /usr/local/include/iri/trajectory)
+FIND_PATH(trajectory_INCLUDE_DIRS trajectory.h trajectory_exceptions.h /usr/local/include/iridrivers /usr/local/include/iri/trajectory /usr/include/iri/trajectory)
 
-FIND_LIBRARY(trajectory_LIBRARY
+FIND_LIBRARY(trajectory_LIBRARIES
     NAMES trajectory
-    PATHS /usr/lib /usr/lib/iri/trajectory /usr/local/lib /usr/local/lib/iri/trajectory)
+    PATHS /usr/local/lib/iridrivers /usr/local/lib/iri/trajectory /usr/lib/iri/trajectory)
 
-SET(trajectory_INCLUDE_DIRS ${trajectory_INCLUDE_DIR})
-SET(trajectory_LIBRARIES    ${trajectory_LIBRARY})
+SET(trajectory_INCLUDE_DIR ${trajectory_INCLUDE_DIRS})
+SET(trajectory_LIBRARY    ${trajectory_LIBRARIES})
 
-IF (trajectory_INCLUDE_DIR AND trajectory_LIBRARY)
+IF (trajectory_INCLUDE_DIRS AND trajectory_LIBRARIES)
    SET(trajectory_FOUND TRUE)
-ENDIF (trajectory_INCLUDE_DIR AND trajectory_LIBRARY)
+ENDIF (trajectory_INCLUDE_DIRS AND trajectory_LIBRARIES)
 
 IF (trajectory_FOUND)
    IF (NOT trajectory_FIND_QUIETLY)
-      MESSAGE(STATUS "Found trajectory: ${trajectory_LIBRARY}")
+      MESSAGE(STATUS "Found trajectory: ${trajectory_LIBRARIES}")
    ENDIF (NOT trajectory_FIND_QUIETLY)
 ELSE (trajectory_FOUND)
    IF (trajectory_FIND_REQUIRED)

src/CMakeLists.txt

@@ -8,7 +8,7 @@ SET(headers ../include/trajectory.h ../include/trajectory_exceptions.h)
 FIND_PACKAGE(iriutils REQUIRED)
 # add the necessary include directories
 INCLUDE_DIRECTORIES(. ../include/)
-INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIRS})
 
 SET_SOURCE_FILES_PROPERTIES(${XSD_SOURCES} PROPERTIES GENERATED 1)
 
@@ -16,8 +16,8 @@ SET_SOURCE_FILES_PROPERTIES(${XSD_SOURCES} PROPERTIES GENERATED 1)
 ADD_LIBRARY(trajectory SHARED ${sources} ${XSD_SOURCES})
 
 # link necessary libraries
-TARGET_LINK_LIBRARIES(trajectory ${XSD_LIBRARY})
-TARGET_LINK_LIBRARIES(trajectory ${iriutils_LIBRARY})
+TARGET_LINK_LIBRARIES(trajectory ${XSD_LIBRARIES})
+TARGET_LINK_LIBRARIES(trajectory ${iriutils_LIBRARIES})
 
 ADD_DEPENDENCIES(trajectory xsd_files_gen)
 

src/xml/CMakeLists.txt

@@ -4,15 +4,16 @@ IF(EXISTS "/usr/include/xsd/cxx")
    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_HAVE_XSD" PARENT_SCOPE)
    SET(XSD_FOUND TRUE) 
    MESSAGE(STATUS "Found the XML library ... adding support for XML files")
-   FIND_LIBRARY(XSD_LIBRARY
+   FIND_LIBRARY(XSD_LIBRARIES
       NAMES xerces-c
       PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu/)
+   SET(XSD_LIBRARY    ${XSD_LIBRARIES})
 ELSE(EXISTS "/usr/include/xsd/cxx")
    MESSAGE(STATUS "XML library not found ... it will be impossible to handle XML files")
 ENDIF(EXISTS "/usr/include/xsd/cxx")
 
 IF(XSD_FOUND)
-   SET(XSD_LIBRARY ${XSD_LIBRARY} PARENT_SCOPE)
+   SET(XSD_LIBRARIES ${XSD_LIBRARIES} PARENT_SCOPE)
    SET(XSD_FILES motion_traj_file.xsd)
 
    IF(XSD_FILES)