Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
trajectory
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
labrobotica
algorithms
trajectory
Commits
d7c361ea
Commit
d7c361ea
authored
6 years ago
by
Alejandro Lopez Gestoso
Browse files
Options
Downloads
Patches
Plain Diff
Removed pluar CMake variables for testing pourpouses
parent
3dbab233
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/CMakeLists.txt
src/xml/CMakeLists.txt
+2
-3
2 additions, 3 deletions
src/xml/CMakeLists.txt
with
3 additions
and
4 deletions
src/CMakeLists.txt
+
1
−
1
View file @
d7c361ea
...
@@ -16,7 +16,7 @@ SET_SOURCE_FILES_PROPERTIES(${XSD_SOURCES} PROPERTIES GENERATED 1)
...
@@ -16,7 +16,7 @@ SET_SOURCE_FILES_PROPERTIES(${XSD_SOURCES} PROPERTIES GENERATED 1)
ADD_LIBRARY
(
trajectory SHARED
${
sources
}
${
XSD_SOURCES
}
)
ADD_LIBRARY
(
trajectory SHARED
${
sources
}
${
XSD_SOURCES
}
)
# link necessary libraries
# link necessary libraries
TARGET_LINK_LIBRARIES
(
trajectory
${
XSD_LIBRAR
IES
}
)
TARGET_LINK_LIBRARIES
(
trajectory
${
XSD_LIBRAR
Y
}
)
TARGET_LINK_LIBRARIES
(
trajectory
${
iriutils_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
trajectory
${
iriutils_LIBRARIES
}
)
ADD_DEPENDENCIES
(
trajectory xsd_files_gen
)
ADD_DEPENDENCIES
(
trajectory xsd_files_gen
)
...
...
This diff is collapsed.
Click to expand it.
src/xml/CMakeLists.txt
+
2
−
3
View file @
d7c361ea
...
@@ -4,16 +4,15 @@ IF(EXISTS "/usr/include/xsd/cxx")
...
@@ -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
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
-D_HAVE_XSD"
PARENT_SCOPE
)
SET
(
XSD_FOUND TRUE
)
SET
(
XSD_FOUND TRUE
)
MESSAGE
(
STATUS
"Found the XML library ... adding support for XML files"
)
MESSAGE
(
STATUS
"Found the XML library ... adding support for XML files"
)
FIND_LIBRARY
(
XSD_LIBRAR
IES
FIND_LIBRARY
(
XSD_LIBRAR
Y
NAMES xerces-c
NAMES xerces-c
PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu/
)
PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu/
)
SET
(
XSD_LIBRARY
${
XSD_LIBRARIES
}
)
ELSE
(
EXISTS
"/usr/include/xsd/cxx"
)
ELSE
(
EXISTS
"/usr/include/xsd/cxx"
)
MESSAGE
(
STATUS
"XML library not found ... it will be impossible to handle XML files"
)
MESSAGE
(
STATUS
"XML library not found ... it will be impossible to handle XML files"
)
ENDIF
(
EXISTS
"/usr/include/xsd/cxx"
)
ENDIF
(
EXISTS
"/usr/include/xsd/cxx"
)
IF
(
XSD_FOUND
)
IF
(
XSD_FOUND
)
SET
(
XSD_LIBRAR
IES
${
XSD_LIBRAR
IES
}
PARENT_SCOPE
)
SET
(
XSD_LIBRAR
Y
${
XSD_LIBRAR
Y
}
PARENT_SCOPE
)
SET
(
XSD_FILES motion_traj_file.xsd
)
SET
(
XSD_FILES motion_traj_file.xsd
)
IF
(
XSD_FILES
)
IF
(
XSD_FILES
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment