Skip to content

Try fix cmake config with new binaries #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bakpaul wants to merge 4 commits into from
Closed

Try fix cmake config with new binaries #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
122844a
Try fix cmake config with new binaries
bakpaul Oct 9, 2026
252b73c
fix cmake scrintg
bakpaul Oct 9, 2026
13be62e
TO REVERT, debug
bakpaul Oct 9, 2026
06c1723
copy in old dir
bakpaul Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -145,7 +150,7 @@ jobs:
echo ${CCACHE_BASEDIR}
ccache -s
fi

################### Artifact naming ##############
- name: Sanitize artifact name
id: sanitize
Expand Down Expand Up @@ -219,4 +224,3 @@ jobs:
artifacts/ConstraintGeometry_*_Linux.zip
artifacts/ConstraintGeometry_*_Windows.zip
artifacts/ConstraintGeometry_*_macOS.zip

6 changes: 4 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -64,15 +66,15 @@ 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
Sofa.GL
)

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"
Expand Down
Loading