diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index da537048141fd60a4e35b4f2de3061ac8d121bd5..8a1d37633a40ff31daed86f93e16da95185f3b8b 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -53,6 +53,17 @@ jobs: make test make install + - name: Configure hpp-fcl + shell: bash -l {0} + run: | + conda activate eigenpy + conda install -c conda-forge octomap assimp qhull + + git clone https://github.com/humanoid-path-planner/hpp-fcl.git --recursive + cd hpp-fcl + mkdir build && cd build + cmake .. -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=$(which python3) + - name: Uninstall EigenPy shell: bash -l {0} run: | diff --git a/.github/workflows/windows-conda.yml b/.github/workflows/windows-conda.yml index 10a7dd5ee22e07902168a074d33580db9eb022c3..b12713af7a8e94d58f9045e14b0532c53c39879c 100644 --- a/.github/workflows/windows-conda.yml +++ b/.github/workflows/windows-conda.yml @@ -30,9 +30,11 @@ jobs: set BOOST_ROOT_1_69_0= set BOOST_ROOT_1_72_0= set PATH=%PATH:C:\hostedtoolcache\windows\Boost\1.72.0;=% + if errorlevel 1 exit 1 :: start building - call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 + call "%programfiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 + if errorlevel 1 exit 1 mkdir build pushd build cmake ^ @@ -43,17 +45,41 @@ jobs: -DPYTHON_SITELIB=%CONDA_PREFIX%\Lib\site-packages ^ -DPYTHON_EXECUTABLE=%CONDA_PREFIX%\python.exe ^ .. + if errorlevel 1 exit 1 :: Build and Install cmake --build . --config Release --target install + if errorlevel 1 exit 1 :: Build stubs git clone https://github.com/jcarpent/pybind11-stubgen.git python "%CD%\pybind11-stubgen\pybind11_stubgen\__init__.py" -o %CONDA_PREFIX%\Lib\site-packages\eigenpy eigenpy --boost-python --ignore-invalid signature --no-setup-py --root-module-suffix "" + if errorlevel 1 exit 1 :: Testing ctest --output-on-failure -C Release -V + if errorlevel 1 exit 1 :: Test Python import cd .. python -c "import eigenpy" + if errorlevel 1 exit 1 + + :: Test packaging + conda install -c conda-forge octomap assimp qhull + git clone --recursive https://github.com/humanoid-path-planner/hpp-fcl.git + pushd hpp-fcl + mkdir build + pushd build + cmake ^ + -G "NMake Makefiles" ^ + -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^ + -DCMAKE_BUILD_TYPE=Release ^ + -DPYTHON_EXECUTABLE=%CONDA_PREFIX%\python.exe ^ + .. + cd .. + if errorlevel 1 exit 1 + + :: Uninstall + cmake --build . --config Release --target uninstall + if errorlevel 1 exit 1 diff --git a/cmake b/cmake index cf8b78dd9cdb220e77623d2997bf223f39da563f..500a3a628496df029671fcd1240be5eec0a9d3f9 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit cf8b78dd9cdb220e77623d2997bf223f39da563f +Subproject commit 500a3a628496df029671fcd1240be5eec0a9d3f9 diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index a41d29b96c4e73ecdd14bff24a1810b84103cccc..80b451e554d84cb576742fbdce390120a82e9a27 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -63,5 +63,7 @@ SET_TESTS_PROPERTIES("py-LLT" PROPERTIES DEPENDS ${PYWRAP}) ADD_PYTHON_UNIT_TEST("py-LDLT" "unittest/python/test_LDLT.py" "python;unittest") SET_TESTS_PROPERTIES("py-LDLT" PROPERTIES DEPENDS ${PYWRAP}) -ADD_PYTHON_UNIT_TEST("py-MINRES" "unittest/python/test_MINRES.py" "python;unittest") -SET_TESTS_PROPERTIES("py-MINRES" PROPERTIES DEPENDS ${PYWRAP}) +IF(NOT WIN32) + ADD_PYTHON_UNIT_TEST("py-MINRES" "unittest/python/test_MINRES.py" "python;unittest") + SET_TESTS_PROPERTIES("py-MINRES" PROPERTIES DEPENDS ${PYWRAP}) +ENDIF(NOT WIN32)