Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dynamixel
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
drivers
dynamixel
Commits
dd28356d
Commit
dd28356d
authored
6 years ago
by
Alejandro Lopez Gestoso
Browse files
Options
Downloads
Patches
Plain Diff
Adapted to Cmake plural variables *_DIRS and *_LIBRARIES
parent
35979ef1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Finddynamixel.cmake
+7
-7
7 additions, 7 deletions
Finddynamixel.cmake
src/CMakeLists.txt
+5
-5
5 additions, 5 deletions
src/CMakeLists.txt
src/xml/CMakeLists.txt
+4
-2
4 additions, 2 deletions
src/xml/CMakeLists.txt
with
16 additions
and
14 deletions
Finddynamixel.cmake
+
7
−
7
View file @
dd28356d
#edit the following line to add the librarie's header files
#edit the following line to add the librarie's header files
FIND_PATH
(
dynamixel_INCLUDE_DIR dynamixel.h dynamixelserver.h dynamixelexceptions.h dynamixel_common.h dynamixel_slave.h dynamixel_slave_ftdi.h dynamixel_slave_serial.h dynamixelserver_ftdi.h dynamixelserver_serial.h /usr/local/include/iridrivers /usr/local/include/iri/dynamixel /usr/include/iri/dynamixel
)
FIND_PATH
(
dynamixel_INCLUDE_DIR
S
dynamixel.h dynamixelserver.h dynamixelexceptions.h dynamixel_common.h dynamixel_slave.h dynamixel_slave_ftdi.h dynamixel_slave_serial.h dynamixelserver_ftdi.h dynamixelserver_serial.h /usr/local/include/iridrivers /usr/local/include/iri/dynamixel /usr/include/iri/dynamixel
)
FIND_LIBRARY
(
dynamixel_LIBRAR
Y
FIND_LIBRARY
(
dynamixel_LIBRAR
IES
NAMES dynamixel
NAMES dynamixel
PATHS /usr/local/lib/iridrivers /usr/local/lib/iri/dynamixel /usr/lib/iri/dynamixel
)
PATHS /usr/local/lib/iridrivers /usr/local/lib/iri/dynamixel /usr/lib/iri/dynamixel
)
SET
(
dynamixel_INCLUDE_DIR
S
${
dynamixel_INCLUDE_DIR
}
)
SET
(
dynamixel_INCLUDE_DIR
${
dynamixel_INCLUDE_DIR
S
}
)
SET
(
dynamixel_LIBRAR
IES
${
dynamixel_LIBRAR
Y
}
)
SET
(
dynamixel_LIBRAR
Y
${
dynamixel_LIBRAR
IES
}
)
IF
(
dynamixel_INCLUDE_DIR AND dynamixel_LIBRAR
Y
)
IF
(
dynamixel_INCLUDE_DIR
S
AND dynamixel_LIBRAR
IES
)
SET
(
dynamixel_FOUND TRUE
)
SET
(
dynamixel_FOUND TRUE
)
ENDIF
(
dynamixel_INCLUDE_DIR AND dynamixel_LIBRAR
Y
)
ENDIF
(
dynamixel_INCLUDE_DIR
S
AND dynamixel_LIBRAR
IES
)
IF
(
dynamixel_FOUND
)
IF
(
dynamixel_FOUND
)
IF
(
NOT dynamixel_FIND_QUIETLY
)
IF
(
NOT dynamixel_FIND_QUIETLY
)
MESSAGE
(
STATUS
"Found dynamixel:
${
dynamixel_LIBRAR
Y
}
"
)
MESSAGE
(
STATUS
"Found dynamixel:
${
dynamixel_LIBRAR
IES
}
"
)
ENDIF
(
NOT dynamixel_FIND_QUIETLY
)
ENDIF
(
NOT dynamixel_FIND_QUIETLY
)
ELSE
(
dynamixel_FOUND
)
ELSE
(
dynamixel_FOUND
)
IF
(
dynamixel_FIND_REQUIRED
)
IF
(
dynamixel_FIND_REQUIRED
)
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
5
−
5
View file @
dd28356d
...
@@ -13,8 +13,8 @@ FIND_PACKAGE(comm REQUIRED)
...
@@ -13,8 +13,8 @@ FIND_PACKAGE(comm REQUIRED)
find_package
(
Boost REQUIRED
)
find_package
(
Boost REQUIRED
)
# edit the following line to add the necessary include directories
# edit the following line to add the necessary include directories
INCLUDE_DIRECTORIES
(
${
iriutils_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
iriutils_INCLUDE_DIR
S
}
)
INCLUDE_DIRECTORIES
(
${
comm_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
comm_INCLUDE_DIR
S
}
)
INCLUDE_DIRECTORIES
(
${
Boost_INCLUDE_DIRS
}
)
INCLUDE_DIRECTORIES
(
${
Boost_INCLUDE_DIRS
}
)
SET_SOURCE_FILES_PROPERTIES
(
${
XSD_SOURCES
}
PROPERTIES GENERATED 1
)
SET_SOURCE_FILES_PROPERTIES
(
${
XSD_SOURCES
}
PROPERTIES GENERATED 1
)
...
@@ -22,9 +22,9 @@ SET_SOURCE_FILES_PROPERTIES(${XSD_SOURCES} PROPERTIES GENERATED 1)
...
@@ -22,9 +22,9 @@ SET_SOURCE_FILES_PROPERTIES(${XSD_SOURCES} PROPERTIES GENERATED 1)
ADD_LIBRARY
(
dynamixel SHARED
${
sources
}
${
XSD_SOURCES
}
)
ADD_LIBRARY
(
dynamixel SHARED
${
sources
}
${
XSD_SOURCES
}
)
#edit the following line to add the necessary system libraries (if any)
#edit the following line to add the necessary system libraries (if any)
TARGET_LINK_LIBRARIES
(
dynamixel
${
iriutils_LIBRAR
Y
}
)
TARGET_LINK_LIBRARIES
(
dynamixel
${
iriutils_LIBRAR
IES
}
)
TARGET_LINK_LIBRARIES
(
dynamixel
${
comm_LIBRAR
Y
}
)
TARGET_LINK_LIBRARIES
(
dynamixel
${
comm_LIBRAR
IES
}
)
TARGET_LINK_LIBRARIES
(
dynamixel
${
XSD_LIBRAR
Y
}
)
TARGET_LINK_LIBRARIES
(
dynamixel
${
XSD_LIBRAR
IES
}
)
TARGET_LINK_LIBRARIES
(
dynamixel
${
Boost_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
dynamixel
${
Boost_LIBRARIES
}
)
ADD_DEPENDENCIES
(
dynamixel xsd_files_gen
)
ADD_DEPENDENCIES
(
dynamixel xsd_files_gen
)
...
...
This diff is collapsed.
Click to expand it.
src/xml/CMakeLists.txt
+
4
−
2
View file @
dd28356d
...
@@ -4,14 +4,16 @@ IF(EXISTS "/usr/include/xsd/cxx")
...
@@ -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
(
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
Y
FIND_LIBRARY
(
XSD_LIBRAR
IES
NAMES xerces-c
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"
)
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_LIBRARIES
${
XSD_LIBRARIES
}
PARENT_SCOPE
)
SET
(
XSD_LIBRARY
${
XSD_LIBRARY
}
PARENT_SCOPE
)
SET
(
XSD_LIBRARY
${
XSD_LIBRARY
}
PARENT_SCOPE
)
SET
(
XSD_PATH
${
CMAKE_CURRENT_SOURCE_DIR
}
)
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