From d7c361ea1562ccfdf14178e55209301f69a23a77 Mon Sep 17 00:00:00 2001
From: Alejandro Lopez Gestoso <alopez@iri.upc.edu>
Date: Tue, 14 May 2019 10:31:04 +0200
Subject: [PATCH] Removed pluar CMake variables for testing pourpouses
---
src/CMakeLists.txt | 2 +-
src/xml/CMakeLists.txt | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 41b6a7f..8c60590 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_LIBRARIES})
+TARGET_LINK_LIBRARIES(trajectory ${XSD_LIBRARY})
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 2f457fe..e571ce2 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -4,16 +4,15 @@ 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_LIBRARIES
+ FIND_LIBRARY(XSD_LIBRARY
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)
IF(XSD_FILES)
--
GitLab