Skip to content

Commit

Permalink
Merge branch 'devel' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
nim65s committed Jul 4, 2024
2 parents 2a3fb8a + 66c0db1 commit 8e967f9
Show file tree
Hide file tree
Showing 6 changed files with 576 additions and 2 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "Nix CI"

on: [pull_request, push]

jobs:
tests:
name: "Nix build on ${{ matrix.os }}"
runs-on: "${{ matrix.os }}-latest"
strategy:
matrix:
os: [ubuntu]
steps:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
- run: nix --accept-flake-config build -L
- run: nix --accept-flake-config run .#cachix push gepetto $(readlink result)
if: github.repository_owner == 'humanoid-path-planner'
env:
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
2 changes: 1 addition & 1 deletion cmake
Submodule cmake updated 65 files
+240 −0 .cmake-format.py
+0 −3 .docs/cmake.py
+0 −1 .docs/conf.py
+2 −10 .github/workflows/cmake.yml
+2 −0 .gitignore
+56 −45 .pre-commit-config.yaml
+127 −0 CMakeLists.txt
+5 −1 Config.cmake.in
+0 −5 GNUInstallDirs.cmake
+7 −3 README.md
+25 −0 _unittests/catkin/CMakeLists.txt
+1 −1 _unittests/cpp/CMakeLists.txt
+1 −1 _unittests/dependency/CMakeLists.txt
+1 −1 _unittests/python/CMakeLists.txt
+31 −1 _unittests/run_unit_tests.sh
+0 −1 _unittests/test_pkg-config.cmake
+58 −28 base.cmake
+0 −5 boost/FindBoost.cmake
+2 −3 cmake_reinstall.cmake.in
+7 −8 cmake_uninstall.cmake.in
+0 −42 compile.py
+128 −39 compiler.cmake
+28 −2 config.hh.cmake
+9 −0 cxx-standard.cmake
+6 −42 cxx11.cmake
+309 −0 cython/cython.cmake
+1 −1 cython/python/FindPython/Support.cmake
+31 −7 doxygen.cmake
+35 −0 find-external/Accelerate/FindAccelerate.cmake
+13 −0 find-external/CDD/FindCDD.cmake
+121 −0 find-external/CHOLMOD/FindCHOLMOD.cmake
+13 −0 find-external/CLP/FindCLP.cmake
+60 −0 find-external/CoinUtils/FindCoinUtils.cmake
+18 −6 find-external/GMP/FindGMP.cmake
+15 −7 find-external/MPFR/FindMPFR.cmake
+767 −18 find-external/OpenMP/FindOpenMP.cmake
+94 −0 find-external/TinyXML/FindTinyXML2.cmake
+124 −98 find-external/assimp/Findassimp.cmake
+14 −0 find-external/glpk/Findglpk.cmake
+19 −0 find-external/qpOASES/FindqpOASES.cmake
+17 −6 git-archive-all.sh
+1 −1 gtest/CMakeLists.txt.in
+59 −14 header.cmake
+2 −2 ide.cmake
+1 −5 logging.cmake
+39 −0 memorycheck_unit_test.cmake.in
+0 −4 msvc-specific.cmake
+5 −2 package-config.cmake
+21 −0 package.xml
+30 −0 pixi.py
+29 −7 pkg-config.cmake
+10 −2 post-project.cmake
+115 −0 python-helpers.cmake
+88 −184 python.cmake
+0 −171 python/FindPythonInterp.cmake
+0 −399 python/FindPythonLibs.cmake
+88 −37 release.cmake
+49 −0 relpath.cmake
+4 −4 sdformat.cmake
+1 −1 stubgen/CMakeLists.txt.in
+43 −9 stubs.cmake
+106 −25 test.cmake
+29 −6 uninstall.cmake
+0 −3 version-script.cmake
+8 −9 version.cmake
49 changes: 49 additions & 0 deletions default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
lib,
stdenv,
cmake,
gepetto-viewer-corba,
hpp-manipulation-corba,
pkg-config,
libsForQt5,
}:

stdenv.mkDerivation {
pname = "hpp-gui";
version = "5.0.0";

src = lib.fileset.toSource {
root = ./.;
fileset = lib.fileset.unions [
./CMakeLists.txt
./doc
./etc
./package.xml
./plugins
./pyplugins
./res
];
};

strictDeps = true;

nativeBuildInputs = [
cmake
libsForQt5.wrapQtAppsHook
pkg-config
];
buildInputs = [ libsForQt5.qtbase ];
propagatedBuildInputs = [
gepetto-viewer-corba
hpp-manipulation-corba
];

doCheck = true;

meta = {
description = "Qt based GUI for HPP project";
homepage = "https://github.com/humanoid-path-planner/hpp-gui";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.nim65s ];
};
}
Loading

0 comments on commit 8e967f9

Please sign in to comment.