diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8c60590568ce1db168fc0d794e4c192388619304..41b6a7fede27b6f5d45bdc59a6dbead18873ac42 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,7 +16,7 @@ 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 ${XSD_LIBRARIES}) TARGET_LINK_LIBRARIES(trajectory ${iriutils_LIBRARIES}) ADD_DEPENDENCIES(trajectory xsd_files_gen) diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index e571ce2aeebfcf21e84d8c2637563e9cf1ff5827..8de9af83fed294b0ce3837c191fc291147e9f487 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -4,14 +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_LIBRARIES ${XSD_LIBRARIES} PARENT_SCOPE) SET(XSD_LIBRARY ${XSD_LIBRARY} PARENT_SCOPE) SET(XSD_FILES motion_traj_file.xsd)