diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index 8a1d37633a40ff31daed86f93e16da95185f3b8b..b509d8dead690847c77cf09d2a35704729e4a1c8 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -53,6 +53,13 @@ jobs: make test make install + - name: Test packaging + shell: bash -l {0} + run: | + conda activate eigenpy + + cmake -B test-packaging -S unittest/packaging/cmake -DPYTHON_EXECUTABLE=$(which python3) + - name: Configure hpp-fcl shell: bash -l {0} run: | diff --git a/.github/workflows/windows-conda.yml b/.github/workflows/windows-conda.yml index b12713af7a8e94d58f9045e14b0532c53c39879c..b25a078e342af433186418a4ce928e18617cc503 100644 --- a/.github/workflows/windows-conda.yml +++ b/.github/workflows/windows-conda.yml @@ -66,6 +66,13 @@ jobs: if errorlevel 1 exit 1 :: Test packaging + + cmake -B test-packaging -S unittest/packaging/cmake ^ + -G "NMake Makefiles" ^ + -DPYTHON_EXECUTABLE=%CONDA_PREFIX%\python.exe + if errorlevel 1 exit 1 + + :: Configure hpp-fcl conda install -c conda-forge octomap assimp qhull git clone --recursive https://github.com/humanoid-path-planner/hpp-fcl.git pushd hpp-fcl diff --git a/cmake b/cmake index e319590e7c73bbe22b86108031722a134d13349b..6c40c9d426410bb25ff511e809192b7dedb4031c 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit e319590e7c73bbe22b86108031722a134d13349b +Subproject commit 6c40c9d426410bb25ff511e809192b7dedb4031c diff --git a/unittest/packaging/cmake/CMakeLists.txt b/unittest/packaging/cmake/CMakeLists.txt index 111929b5bce02b7d9e8b4fb392def9c2b64bd674..f16ffce844b1105e7e0d29641ffcca858d458e3a 100644 --- a/unittest/packaging/cmake/CMakeLists.txt +++ b/unittest/packaging/cmake/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 2.6) project(ExtraLib CXX) find_package(eigenpy REQUIRED) -find_package(PythonInterp REQUIRED) -find_package(PythonLibs REQUIRED) add_executable(extra_lib extra_lib.cpp) -target_link_libraries(extra_lib PUBLIC eigenpy::eigenpy ${PYTHON_LIBRARIES}) +target_link_libraries(extra_lib PUBLIC eigenpy::eigenpy)