Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
ptu_d46
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
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
drivers
ptu_d46
Commits
93cb53c4
Commit
93cb53c4
authored
6 years ago
by
Alejandro Lopez Gestoso
Browse files
Options
Downloads
Patches
Plain Diff
Adapted to cmake plural variables *_DIRS and *_LIBRARIES
parent
17471b54
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Findptu_d46.cmake
+2
-2
2 additions, 2 deletions
Findptu_d46.cmake
src/CMakeLists.txt
+7
-7
7 additions, 7 deletions
src/CMakeLists.txt
src/xml/CMakeLists.txt
+4
-2
4 additions, 2 deletions
src/xml/CMakeLists.txt
with
13 additions
and
11 deletions
Findptu_d46.cmake
+
2
−
2
View file @
93cb53c4
#edit the following line to add the librarie's header files
FIND_PATH
(
ptu_d46_INCLUDE_DIRS ptu_commands.h ptu_d46.h ptu_d46_exceptions.h /usr/include/iri/ptu_d46 /usr/
local/
include/iri/ptu_d46
)
FIND_PATH
(
ptu_d46_INCLUDE_DIRS ptu_commands.h ptu_d46.h ptu_d46_exceptions.h /usr/include/
iridrivers /usr/local/include/
iri/ptu_d46 /usr/include/iri/ptu_d46
)
FIND_LIBRARY
(
ptu_d46_LIBRARIES
NAMES ptu_d46
PATHS /usr/l
ib /usr
/lib/iri
/ptu_d46
/usr/local/lib
/usr/local
/lib/iri/ptu_d46
)
PATHS /usr/l
ocal
/lib/iri
drivers
/usr/local/lib
/iri/ptu_d46 /usr
/lib/iri/ptu_d46
)
SET
(
ptu_d46_INCLUDE_DIR
${
ptu_d46_INCLUDE_DIRS
}
)
SET
(
ptu_d46_LIBRARY
${
ptu_d46_LIBRARIES
}
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
7
−
7
View file @
93cb53c4
...
...
@@ -12,9 +12,9 @@ FIND_PACKAGE(trajectory REQUIRED)
# edit the following line to add the necessary include directories
INCLUDE_DIRECTORIES
(
. ../include
)
INCLUDE_DIRECTORIES
(
${
iriutils_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
comm_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
trajectory_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
iriutils_INCLUDE_DIR
S
}
)
INCLUDE_DIRECTORIES
(
${
comm_INCLUDE_DIR
S
}
)
INCLUDE_DIRECTORIES
(
${
trajectory_INCLUDE_DIR
S
}
)
SET_SOURCE_FILES_PROPERTIES
(
${
XSD_SOURCES
}
PROPERTIES GENERATED 1
)
...
...
@@ -23,10 +23,10 @@ ADD_LIBRARY(ptu_d46 SHARED ${sources} ${XSD_SOURCES})
ADD_DEPENDENCIES
(
ptu_d46 xsd_files_gen
)
#edit the following line to add the necessary system libraries (if any)
TARGET_LINK_LIBRARIES
(
ptu_d46
${
iriutils_LIBRAR
Y
}
)
TARGET_LINK_LIBRARIES
(
ptu_d46
${
comm_LIBRAR
Y
}
)
TARGET_LINK_LIBRARIES
(
ptu_d46
${
XSD_LIBRAR
Y
}
)
TARGET_LINK_LIBRARIES
(
ptu_d46
${
trajectory_LIBRAR
Y
}
)
TARGET_LINK_LIBRARIES
(
ptu_d46
${
iriutils_LIBRAR
IES
}
)
TARGET_LINK_LIBRARIES
(
ptu_d46
${
comm_LIBRAR
IES
}
)
TARGET_LINK_LIBRARIES
(
ptu_d46
${
XSD_LIBRAR
IES
}
)
TARGET_LINK_LIBRARIES
(
ptu_d46
${
trajectory_LIBRAR
IES
}
)
INSTALL
(
TARGETS ptu_d46
RUNTIME DESTINATION bin
...
...
This diff is collapsed.
Click to expand it.
src/xml/CMakeLists.txt
+
4
−
2
View file @
93cb53c4
...
...
@@ -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_LIBRAR
Y
FIND_LIBRARY
(
XSD_LIBRAR
IES
NAMES xerces-c
PATHS /usr/lib /usr/local/lib
)
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_PATH
${
CMAKE_CURRENT_SOURCE_DIR
}
)
...
...
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