diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e891f4..b47e591 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: - main - master tags: - - 'v*' #release tags in format of e.g: 'v25.12.00' + - 'v*' #release tags in format of e.g: 'v25.12.00' pull_request: types: [opened, synchronize, reopened, labeled] @@ -86,14 +86,19 @@ jobs: shell: bash run: | mkdir -p deps/CollisionAlgorithm/build + + mkdir -p $SOFA_ROOT/include/extlibs/WinDepPack/GL + mv $SOFA_ROOT/include/extlibs/GL/glew.h $SOFA_ROOT/include/extlibs/WinDepPack/GL + if [[ "$RUNNER_OS" == "Windows" ]]; then cmd //c "${{ steps.sofa.outputs.vs_vsdevcmd }} \ && cd /d %GITHUB_WORKSPACE%/deps/CollisionAlgorithm/build \ && cmake \ -GNinja \ - -DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake" \ + -DCMAKE_PREFIX_PATH=\"$SOFA_ROOT/lib/cmake\" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%/deps/CollisionAlgorithm/install \ + --debug-find-var=GLEW_INCLUDE_DIR \ .. \ && ninja install" else @@ -145,7 +150,7 @@ jobs: echo ${CCACHE_BASEDIR} ccache -s fi - + ################### Artifact naming ############## - name: Sanitize artifact name id: sanitize @@ -219,4 +224,3 @@ jobs: artifacts/ConstraintGeometry_*_Linux.zip artifacts/ConstraintGeometry_*_Windows.zip artifacts/ConstraintGeometry_*_macOS.zip - diff --git a/CMakeLists.txt b/CMakeLists.txt index af88815..8cf41b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.12) project(ConstraintGeometry VERSION 0.1 LANGUAGES CXX) +message(STATUS "INC=${CMAKE_INCLUDE_PATH}") + find_package(CollisionAlgorithm REQUIRED) find_package(Sofa.Component.StateContainer REQUIRED) find_package(Sofa.Component.Constraint.Lagrangian.Solver REQUIRED) @@ -64,7 +66,7 @@ set(SOURCE_FILES add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${HEADER_FILES} ${README_FILES}) -target_link_libraries(${PROJECT_NAME} +target_link_libraries(${PROJECT_NAME} CollisionAlgorithm Sofa.Component.StateContainer Sofa.Component.Constraint.Lagrangian.Solver @@ -72,7 +74,7 @@ target_link_libraries(${PROJECT_NAME} ) sofa_create_package_with_targets( - PACKAGE_NAME ${PROJECT_NAME} + PACKAGE_NAME ${PROJECT_NAME} PACKAGE_VERSION ${PROJECT_VERSION} TARGETS ${PROJECT_NAME} AUTO_SET_TARGET_PROPERTIES INCLUDE_SOURCE_DIR "src"