diff --git a/.github/workflows/windows-conda.yml b/.github/workflows/windows-conda.yml index d8c21713ab8cc0dfa6c5f6884161f26fb2a724d8..1d2daf0d3688b36fecd517e3688fe755e4ec8eae 100644 --- a/.github/workflows/windows-conda.yml +++ b/.github/workflows/windows-conda.yml @@ -44,11 +44,10 @@ jobs: call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 - :: start building + :: Building mkdir build pushd build - set PKG_CONFIG_PATH=%CONDA_PREFIX%\Library\share\pkgconfig:%CONDA_PREFIX%\Library\share\pkgconfig cmake ^ -G "Visual Studio 16 2019" -T "ClangCl" -DCMAKE_GENERATOR_PLATFORM=x64 ^ -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^ @@ -58,5 +57,7 @@ jobs: -DBUILD_WITH_URDF_SUPPORT=ON -DBUILD_PYTHON_INTERFACE=ON ^ .. cmake --build . --config Release --target install + + :: Testing set PATH=%PATH%;%CONDA_PREFIX%\Library\lib;%CONDA_PREFIX%\Lib\site-packages\pinocchio - ctest --output-on-failure -C Release + ctest --output-on-failure -C Release -V diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 55b06057512e9297bf8b7f76fd8073da296a668c..b18e001f001ccc436b4dcda98329a07b8cef7a30 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -58,6 +58,10 @@ ADD_HEADER_GROUP(HEADERS) ADD_SOURCE_GROUP(${PROJECT_NAME}_SOURCES) INSTALL(TARGETS ${PROJECT_NAME} - EXPORT ${TARGETS_EXPORT_NAME} - DESTINATION lib) + EXPORT ${TARGETS_EXPORT_NAME} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})