From 122844ad2e37346da43678f0241c479332f00e7a Mon Sep 17 00:00:00 2001 From: Paul Baksic <30337881+bakpaul@users.noreply.github.com> Date: Fri, 9 Oct 2026 11:38:19 +0200 Subject: [PATCH 1/4] Try fix cmake config with new binaries --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e891f4..ee4ccc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,6 +94,8 @@ jobs: -DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%/deps/CollisionAlgorithm/install \ + -DCMAKE_INCLUDE_PATH="$SOFA_ROOT/include/extlibs/" \ + -DCMAKE_LIBRARY_PATH="$SOFA_ROOT/lib/;$SOFA_ROOT/bin/" \ .. \ && ninja install" else From 252b73c09007fe3b23d902f3e01638cfaaba7556 Mon Sep 17 00:00:00 2001 From: Paul Baksic Date: Fri, 9 Oct 2026 11:53:19 +0200 Subject: [PATCH 2/4] fix cmake scrintg --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee4ccc8..8a84778 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] @@ -91,11 +91,11 @@ jobs: && 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 \ - -DCMAKE_INCLUDE_PATH="$SOFA_ROOT/include/extlibs/" \ - -DCMAKE_LIBRARY_PATH="$SOFA_ROOT/lib/;$SOFA_ROOT/bin/" \ + -DCMAKE_INCLUDE_PATH=\"$SOFA_ROOT/include/extlibs/\" \ + -DCMAKE_LIBRARY_PATH=\"$SOFA_ROOT/lib/;$SOFA_ROOT/bin/\" \ .. \ && ninja install" else @@ -147,7 +147,7 @@ jobs: echo ${CCACHE_BASEDIR} ccache -s fi - + ################### Artifact naming ############## - name: Sanitize artifact name id: sanitize @@ -221,4 +221,3 @@ jobs: artifacts/ConstraintGeometry_*_Linux.zip artifacts/ConstraintGeometry_*_Windows.zip artifacts/ConstraintGeometry_*_macOS.zip - From 13be62e79d60ebeac5420b8a9a0825baef7335c1 Mon Sep 17 00:00:00 2001 From: Paul Baksic Date: Fri, 9 Oct 2026 13:19:07 +0200 Subject: [PATCH 3/4] TO REVERT, debug --- .github/workflows/ci.yml | 1 + CMakeLists.txt | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a84778..fe48173 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,6 +96,7 @@ jobs: -DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%/deps/CollisionAlgorithm/install \ -DCMAKE_INCLUDE_PATH=\"$SOFA_ROOT/include/extlibs/\" \ -DCMAKE_LIBRARY_PATH=\"$SOFA_ROOT/lib/;$SOFA_ROOT/bin/\" \ + --debug-find-var=GLEW_INCLUDE_DIR \ .. \ && ninja install" else 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" From 06c1723e1e4d1578a9aba4fc15dde2918265d2f4 Mon Sep 17 00:00:00 2001 From: Paul Baksic Date: Fri, 9 Oct 2026 13:54:23 +0200 Subject: [PATCH 4/4] copy in old dir --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe48173..b47e591 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,6 +86,10 @@ 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 \ @@ -94,8 +98,6 @@ jobs: -DCMAKE_PREFIX_PATH=\"$SOFA_ROOT/lib/cmake\" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%/deps/CollisionAlgorithm/install \ - -DCMAKE_INCLUDE_PATH=\"$SOFA_ROOT/include/extlibs/\" \ - -DCMAKE_LIBRARY_PATH=\"$SOFA_ROOT/lib/;$SOFA_ROOT/bin/\" \ --debug-find-var=GLEW_INCLUDE_DIR \ .. \ && ninja install"