diff --git a/.github/workflows/windows-conda.yml b/.github/workflows/windows-conda.yml index 8a616cb1f..4b612d1a3 100644 --- a/.github/workflows/windows-conda.yml +++ b/.github/workflows/windows-conda.yml @@ -48,7 +48,42 @@ jobs: if errorlevel 1 exit 1 :: Build and Install - cmake --build . --config Release --target toto + cmake --build . --config Release --target install + 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 + + 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 + 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 check: diff --git a/cmake b/cmake index 04aab10bc..de3413743 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 04aab10bc616491666aba32ec55627e141f8f47d +Subproject commit de3413743bf2949c17c54c078c14729ffaf071b6 diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 58f3c820e..06959b2cc 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -74,20 +74,3 @@ foreach(python ${PYTHON_FILES}) install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/eigenpy/${python}" DESTINATION ${${PYWRAP}_INSTALL_DIR}) endforeach(python) - -set(_optional_args ${PYWRAP} ${PROJECT_NAME}) -foreach(py_target IN LISTS _optional_args) - if(TARGET ${py_target}) - set(_is_lib - "$,SHARED_LIBRARY>") - set(_target_dir "$") - set(_path "$<${_is_lib}:${_target_dir}\\\;>${_path}") - endif() -endforeach() - -string(REPLACE ";" "\;" PATH_STR "$ENV{PATH}") -set(ENV_PATH "LPATH=${_path}${PATH_STR}") -add_custom_target( - toto ALL - COMMAND ${CMAKE_COMMAND} -E env ${ENV_PATH} ECHO %LPATH% - VERBATIM)