Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
coal
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
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
Coal
coal
Commits
d74a7e54
Commit
d74a7e54
authored
5 years ago
by
Joseph Mirabel
Browse files
Options
Downloads
Patches
Plain Diff
[Doc][Python] Fix compilation when doxygen is not found.
parent
f66e1c31
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
python/CMakeLists.txt
+20
-13
20 additions, 13 deletions
python/CMakeLists.txt
python/collision-geometries.cc
+4
-0
4 additions, 0 deletions
python/collision-geometries.cc
python/math.cc
+3
-0
3 additions, 0 deletions
python/math.cc
with
27 additions
and
13 deletions
python/CMakeLists.txt
+
20
−
13
View file @
d74a7e54
...
...
@@ -43,21 +43,25 @@ INCLUDE_DIRECTORIES("${Boost_INCLUDE_DIRS}" ${PYTHON_INCLUDE_DIRS})
INCLUDE_DIRECTORIES
(
"
${
CMAKE_SOURCE_DIR
}
/src"
)
INCLUDE_DIRECTORIES
(
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
ADD_CUSTOM_TARGET
(
generate_doxygen_cpp_doc
COMMAND
${
CMAKE_SOURCE_DIR
}
/doc/python/doxygen_xml_parser.py
${
CMAKE_BINARY_DIR
}
/doc/doxygen-xml/index.xml
${
CMAKE_CURRENT_BINARY_DIR
}
/doxygen_autodoc >
${
CMAKE_CURRENT_BINARY_DIR
}
/doxygen_autodoc.log
BYPRODUCTS
${
CMAKE_CURRENT_BINARY_DIR
}
/doxygen_autodoc/doxygen_xml_parser_for_cmake.hh
${
CMAKE_CURRENT_BINARY_DIR
}
/doxygen_autodoc.log
COMMENT
"Generating Doxygen C++ documentation"
)
ADD_DEPENDENCIES
(
generate_doxygen_cpp_doc doc
)
SET
(
${
LIBRARY_NAME
}
_HEADERS
${
CMAKE_CURRENT_BINARY_DIR
}
/doxygen_autodoc/doxygen_xml_parser_for_cmake.hh
fcl.hh
)
IF
(
DOXYGEN_FOUND
)
ADD_CUSTOM_TARGET
(
generate_doxygen_cpp_doc
COMMAND
${
CMAKE_SOURCE_DIR
}
/doc/python/doxygen_xml_parser.py
${
CMAKE_BINARY_DIR
}
/doc/doxygen-xml/index.xml
${
CMAKE_CURRENT_BINARY_DIR
}
/doxygen_autodoc >
${
CMAKE_CURRENT_BINARY_DIR
}
/doxygen_autodoc.log
BYPRODUCTS
${
CMAKE_CURRENT_BINARY_DIR
}
/doxygen_autodoc/doxygen_xml_parser_for_cmake.hh
${
CMAKE_CURRENT_BINARY_DIR
}
/doxygen_autodoc.log
COMMENT
"Generating Doxygen C++ documentation"
)
ADD_DEPENDENCIES
(
generate_doxygen_cpp_doc doc
)
LIST
(
APPEND
${
LIBRARY_NAME
}
_HEADERS
${
CMAKE_CURRENT_BINARY_DIR
}
/doxygen_autodoc/doxygen_xml_parser_for_cmake.hh
)
ENDIF
()
SET
(
${
LIBRARY_NAME
}
_SOURCES
version.cc
...
...
@@ -72,7 +76,10 @@ ADD_LIBRARY(${LIBRARY_NAME} SHARED ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_
ADD_DEPENDENCIES
(
python
${
LIBRARY_NAME
}
)
ADD_HEADER_GROUP
(
${
LIBRARY_NAME
}
_HEADER
)
ADD_SOURCE_GROUP
(
${
LIBRARY_NAME
}
_SOURCES
)
ADD_DEPENDENCIES
(
${
LIBRARY_NAME
}
generate_doxygen_cpp_doc
)
IF
(
DOXYGEN_FOUND
)
ADD_DEPENDENCIES
(
${
LIBRARY_NAME
}
generate_doxygen_cpp_doc
)
TARGET_COMPILE_DEFINITIONS
(
${
LIBRARY_NAME
}
PRIVATE -DHAS_DOXYGEN_AUTODOC
)
ENDIF
()
TARGET_LINK_BOOST_PYTHON
(
${
LIBRARY_NAME
}
PUBLIC
)
TARGET_LINK_LIBRARIES
(
${
LIBRARY_NAME
}
PUBLIC
${
PROJECT_NAME
}
${
BOOST_system_LIBRARY
}
)
...
...
This diff is collapsed.
Click to expand it.
python/collision-geometries.cc
+
4
−
0
View file @
d74a7e54
...
...
@@ -43,8 +43,12 @@
#include
<hpp/fcl/shape/convex.h>
#include
<hpp/fcl/BVH/BVH_model.h>
#ifdef HAS_DOXYGEN_AUTODOC
#include
"doxygen_autodoc/hpp/fcl/BVH/BVH_model.h"
#include
"doxygen_autodoc/hpp/fcl/shape/geometric_shapes.h"
#endif
#include
"../doc/python/doxygen.hh"
using
namespace
boost
::
python
;
...
...
This diff is collapsed.
Click to expand it.
python/math.cc
+
3
−
0
View file @
d74a7e54
...
...
@@ -42,8 +42,11 @@
#include
"fcl.hh"
#ifdef HAS_DOXYGEN_AUTODOC
#include
"doxygen_autodoc/hpp/fcl/math/transform.h"
#endif
#include
"../doc/python/doxygen.hh"
#include
"../doc/python/doxygen-boost.hh"
using
namespace
boost
::
python
;
...
...
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