Unverified Commit e2e377cb authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub
Browse files

Merge pull request #1541 from wxmerkt/topic/turn-off-automatic-documentation-generation

Turn off automatic documentation generation
parents 0ec6921d 3bb196d3
......@@ -17,6 +17,12 @@ jobs:
fetch-depth: 0
submodules: recursive
- name: ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{ matrix.os }}-${{ matrix.type }}
max-size: 1G
# extract branch name
- name: Get branch name (merge)
if: github.event_name != 'pull_request'
......@@ -71,9 +77,11 @@ jobs:
export PYTHONPATH=${PYTHONPATH}:/opt/openrobots/lib/python$PYTHON3_DOT_VERSION/site-packages
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/openrobots/lib:/usr/local/lib:/usr/lib:/usr/lib/x86_64-linux-gnu
export MAKEFLAGS="-j1"
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
mkdir build
cd build
cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_WITH_COLLISION_SUPPORT=ON -DBUILD_ADVANCED_TESTING=ON -DBUILD_WITH_CASADI_SUPPORT=ON -DPYTHON_EXECUTABLE=$(which python3) -DBUILD_WITH_OPENMP_SUPPORT=ON
cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_WITH_COLLISION_SUPPORT=ON -DBUILD_ADVANCED_TESTING=ON -DBUILD_WITH_CASADI_SUPPORT=ON -DPYTHON_EXECUTABLE=$(which python3) -DBUILD_WITH_OPENMP_SUPPORT=ON -DINSTALL_DOCUMENTATION=ON
make
make build_tests
export CTEST_OUTPUT_ON_FAILURE=1
......
......@@ -15,6 +15,12 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{ matrix.os }}-${{ matrix.type }}
max-size: 1G
- name: Checkout submodules
run: |
git submodule update --init
......@@ -39,10 +45,12 @@ jobs:
conda activate pinocchio
echo $CONDA_PREFIX
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_COLLISION_SUPPORT=ON -DBUILD_ADVANCED_TESTING=ON -DBUILD_WITH_CASADI_SUPPORT=OFF -DPYTHON_EXECUTABLE=$(which python3) -DBUILD_WITH_OPENMP_SUPPORT=ON
cmake .. -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release -DBUILD_WITH_COLLISION_SUPPORT=ON -DBUILD_ADVANCED_TESTING=ON -DBUILD_WITH_CASADI_SUPPORT=OFF -DPYTHON_EXECUTABLE=$(which python3) -DBUILD_WITH_OPENMP_SUPPORT=ON -DINSTALL_DOCUMENTATION=ON
make
make build_tests
export CTEST_OUTPUT_ON_FAILURE=1
......
......@@ -59,6 +59,7 @@ jobs:
-DBUILD_WITH_URDF_SUPPORT=ON ^
-DBUILD_PYTHON_INTERFACE=ON ^
-DBUILD_WITH_COLLISION_SUPPORT=ON ^
-DINSTALL_DOCUMENTATION=ON ^
..
:: Build
......
......@@ -62,6 +62,7 @@ jobs:
-DBUILD_PYTHON_INTERFACE=OFF ^
-DBUILD_WITH_COLLISION_SUPPORT=ON ^
-DBUILD_TESTING=ON ^
-DINSTALL_DOCUMENTATION=ON ^
..
:: Build
......
......@@ -16,6 +16,12 @@ SET(PROJECT_USE_KEYWORD_LINK_LIBRARIES TRUE)
SET(CXX_DISABLE_WERROR True)
SET(CMAKE_VERBOSE_MAKEFILE True)
# ----------------------------------------------------
# --- OPTIONS ---------------------------------------
# Need to be set before including base.cmake
# ----------------------------------------------------
OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" OFF)
# Check if the submodule cmake have been initialized
IF(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/cmake/base.cmake")
MESSAGE(FATAL_ERROR "\nPlease run the following command first:\ngit submodule update --init\n")
......
......@@ -265,13 +265,12 @@ IF(BUILD_PYTHON_INTERFACE)
SET(DOXYGEN_GENERATE_HTML YES)
SET(DOXYGEN_GENERATE_LATEX NO)
SET(DOXYGEN_PROJECT_NAME "Pinocchio PyBind11 helpers.")
message("DOXYGEN_GENERATE_HTML: ${DOXYGEN_GENERATE_HTML}")
cmake_policy(PUSH)
cmake_policy(SET CMP0054 NEW)
doxygen_add_docs(doc_pybind11
CMAKE_POLICY(PUSH)
CMAKE_POLICY(SET CMP0054 NEW)
DOXYGEN_ADD_DOCS(doc_pybind11
pybind11.hpp pybind11-all.hpp
USE_STAMP_FILE
COMMENT "Generating documentation of the PyBind11 helpers.")
cmake_policy(POP)
CMAKE_POLICY(POP)
ENDIF()
ENDIF(BUILD_PYTHON_INTERFACE)
......@@ -196,8 +196,6 @@ py::object default_arg(T t) {
static pybind11::handle cast(native_type src, \
pybind11::return_value_policy /*policy*/, \
pybind11::handle /*parent*/) { \
typename boost::python::manage_new_object::apply<native_type*>::type \
converter; \
return boost::python::api::object(src).ptr(); \
} \
}; \
......
......@@ -11,7 +11,7 @@
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <boost/test/floating_point_comparison.hpp>
#include <boost/test/tools/floating_point_comparison.hpp>
BOOST_AUTO_TEST_SUITE ( BOOST_TEST_MODULE )
......
......@@ -8,16 +8,29 @@ if(CMAKE_VERSION VERSION_GREATER 3.11)
FetchContent_Populate(pybind11)
add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR})
pybind11_add_module(cpp2pybind11 cpp2pybind11.cpp)
target_link_libraries(cpp2pybind11 PRIVATE pinocchio_pywrap)
#pybind11_add_module(cpp2pybind11 cpp2pybind11.cpp) # BUG: might not work out of the box on OSX with conda: https://github.com/pybind/pybind11/issues/3081
add_library(cpp2pybind11 MODULE cpp2pybind11.cpp)
target_link_libraries(cpp2pybind11 PRIVATE pinocchio_pywrap pybind11::module)
SET_TARGET_PROPERTIES(cpp2pybind11
PROPERTIES
PREFIX ""
SUFFIX ${PYTHON_EXT_SUFFIX}
)
IF(BUILD_WITH_OPENMP_SUPPORT AND NOT LINK_PYTHON_INTERFACE_TO_OPENMP)
TARGET_LINK_LIBRARIES(cpp2pybind11 PRIVATE OpenMP::OpenMP_CXX)
ENDIF()
if(CMAKE_CXX_STANDARD LESS 14)
message(STATUS "CXX_STANDARD for cpp2pybind11 set changed from ${CMAKE_CXX_STANDARD} to 14")
message(STATUS "CXX_STANDARD for cpp2pybind11 changed from ${CMAKE_CXX_STANDARD} to 14")
set_target_properties(cpp2pybind11 PROPERTIES CXX_STANDARD 14)
endif()
if(WIN32)
target_compile_definitions(cpp2pybind11 PRIVATE -DNOMINMAX)
endif(WIN32)
add_python_unit_test("test-py-cpp2pybind11" "unittest/python/pybind11/test-cpp2pybind11.py" "bindings/python" "unittest/python/pybind11")
endif()
endif()
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment