Skip to content

Sync submodule CMake #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 9, 2020
Merged

Sync submodule CMake #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20ca082
cmake: sync submodule
jcarpent Nov 7, 2020
671c9d1
cmake: set options for finding Boost
jcarpent Nov 7, 2020
451b300
[CI] use generated conf
nim65s Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 1 addition & 116 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,116 +1 @@
# https://rainboard.laas.fr/project/eigenpy/.gitlab-ci.yml

variables:
CCACHE_BASEDIR: "${CI_PROJECT_DIR}"
CCACHE_DIR: "${CI_PROJECT_DIR}/ccache"

cache:
paths:
- ccache

.robotpkg-py-eigenpy: &robotpkg-py-eigenpy
retry:
max: 2
when: runner_system_failure
except:
- gh-pages
script:
- mkdir -p ccache
- cd /root/robotpkg/math
- git pull
- cd py-eigenpy
- make checkout MASTER_REPOSITORY="git ${CI_PROJECT_DIR}/.git"
- make install
- build=$(make show-var VARNAME=CONFIGURE_DIRS); cd $(make show-var VARNAME=WRKSRC); cd $build
- make test

robotpkg-py-eigenpy-16.04-debug:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy:16.04
before_script:
- echo PKG_OPTIONS.py-eigenpy=debug >> /opt/openrobots/etc/robotpkg.conf

robotpkg-py-eigenpy-16.04-release:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy:16.04

robotpkg-py-eigenpy-py3-16.04-debug:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy-py3:16.04
before_script:
- echo PKG_OPTIONS.py-eigenpy=debug >> /opt/openrobots/etc/robotpkg.conf

robotpkg-py-eigenpy-py3-16.04-release:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy-py3:16.04

robotpkg-py-eigenpy-py3-18.04-release:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy-py3:18.04

robotpkg-py-eigenpy-py3-18.04-debug:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy-py3:18.04
before_script:
- echo PKG_OPTIONS.py-eigenpy=debug >> /opt/openrobots/etc/robotpkg.conf

robotpkg-py-eigenpy-18.04-release:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy:18.04

robotpkg-py-eigenpy-18.04-debug:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy:18.04
before_script:
- echo PKG_OPTIONS.py-eigenpy=debug >> /opt/openrobots/etc/robotpkg.conf

robotpkg-py-eigenpy-stretch-debug:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy:stretch
before_script:
- echo PKG_OPTIONS.py-eigenpy=debug >> /opt/openrobots/etc/robotpkg.conf

robotpkg-py-eigenpy-stretch-release:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy:stretch

robotpkg-py-eigenpy-py3-stretch-release:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy-py3:stretch

robotpkg-py-eigenpy-py3-stretch-debug:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy-py3:stretch
before_script:
- echo PKG_OPTIONS.py-eigenpy=debug >> /opt/openrobots/etc/robotpkg.conf

doc-coverage:
<<: *robotpkg-py-eigenpy
image: memmos.laas.fr:5000/stack-of-tasks/eigenpy/py-eigenpy:18.04
before_script:
- echo -e 'CXXFLAGS+= --coverage\nLDFLAGS+= --coverage\nPKG_DEFAULT_OPTIONS= debug' >> /opt/openrobots/etc/robotpkg.conf
after_script:
- cd /root/robotpkg/math/py-eigenpy
- build=$(make show-var VARNAME=CONFIGURE_DIRS); cd $(make show-var VARNAME=WRKSRC); cd $build
- mkdir -p ${CI_PROJECT_DIR}/coverage/
- gcovr -r .
- gcovr -r . --html --html-details -o ${CI_PROJECT_DIR}/coverage/index.html
artifacts:
expire_in: 1 day
paths:
- doxygen-html/
- coverage/

format:
allow_failure: true
image: gepetto/linters
retry:
max: 2
when: runner_system_failure
before_script:
- test -f /builds/setup.cfg || ln -s /root/setup.cfg /builds
- test -f /builds/.clang-format || ln -s /root/.clang-format /builds
script:
- check-clang-format.sh
- flake8 .
- yapf -dr .
include: https://rainboard.laas.fr/project/eigenpy/.gitlab-ci.yml
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ ENDIF(WIN32)
# ----------------------------------------------------
ADD_PROJECT_DEPENDENCY(Eigen3 REQUIRED PKG_CONFIG_REQUIRES "eigen3 >= 3.0.5")

SET_BOOST_DEFAULT_OPTIONS()
EXPORT_BOOST_DEFAULT_OPTIONS()
FIND_PACKAGE(Boost REQUIRED)
SEARCH_FOR_BOOST_PYTHON()

# ----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion cmake
Open in desktop
Submodule cmake updated 31 files
+11 −1 .github/workflows/cmake.yml
+20 −4 Config.cmake.in
+30 −0 _unittests/cpp/CMakeLists.txt
+1 −0 _unittests/cpp/include/jrl_cmakemodule/lib.hh
+7 −0 _unittests/cpp/src/lib.cc
+8 −0 _unittests/cpp/src/main.cc
+20 −0 _unittests/dependency/CMakeLists.txt
+11 −0 _unittests/macros.cmake
+21 −0 _unittests/python/CMakeLists.txt
+0 −0 _unittests/python/jrl_cmakemodule/python.py
+46 −0 _unittests/run_unit_tests.sh
+12 −1 base.cmake
+23 −13 boost.cmake
+3 −3 dist.cmake
+4 −4 doxygen.cmake
+2 −0 find-external/CppAD/Findcppad.cmake
+1 −0 find-external/CppAD/Findcppadcg.cmake
+4 −4 header.cmake
+2 −2 hpp.cmake
+1 −1 hpp/doc.cmake
+1 −1 idl.cmake
+2 −2 msvc-specific.cmake
+1 −1 openhrpcontroller.cmake
+1 −1 openrtm.cmake
+2 −2 package-config.cmake
+7 −7 pkg-config.cmake
+1 −0 post-project.cmake
+16 −7 python.cmake
+2 −2 uninstall.cmake
+1 −1 version-script.cmake
+2 −3 version.cmake