diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec39295..86da1f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,6 @@ name: CI on: workflow_dispatch: - pull_request: push: jobs: @@ -21,11 +20,16 @@ jobs: shell: bash if: runner.os == 'macOS' run: | - rm /usr/local/bin/2to3 - rm /usr/local/bin/idle3 - rm /usr/local/bin/pydoc3 - rm /usr/local/bin/python3 - rm /usr/local/bin/python3-config + rm -f /usr/local/bin/2to3 + rm -f /usr/local/bin/idle3 + rm -f /usr/local/bin/pydoc3 + rm -f /usr/local/bin/python3 + rm -f /usr/local/bin/python3-config + rm -f /usr/local/bin/2to3-3.11 + rm -f /usr/local/bin/idle3.11 + rm -f /usr/local/bin/pydoc3.11 + rm -f /usr/local/bin/python3.11 + rm -f /usr/local/bin/python3.11-config - name: Setup SOFA and environment id: sofa diff --git a/CGALPlugin_test/CMakeLists.txt b/CGALPlugin_test/CMakeLists.txt index 01d34f5..6c3fd29 100644 --- a/CGALPlugin_test/CMakeLists.txt +++ b/CGALPlugin_test/CMakeLists.txt @@ -8,8 +8,8 @@ set(HEADER_FILES set(SOURCE_FILES ) -find_package(Sofa.Testing REQUIRED) -find_package(image QUIET) +sofa_find_package(Sofa.Testing REQUIRED) +sofa_find_package(image QUIET) if(image_FOUND) @@ -22,7 +22,7 @@ if(image_FOUND) # the following 4 lines must be put outside of the "if" section as soon as there is another source file added to the project add_definitions("-DSOFACGAL_TEST_RESOURCES_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/../scenes/data/\"") add_executable(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES}) - target_link_libraries(${PROJECT_NAME} CGALPlugin Sofa.Testing Sofa.Component.StateContainer SceneCreator) + target_link_libraries(${PROJECT_NAME} CGALPlugin Sofa.Testing Sofa.Component.StateContainer SceneCreator image) add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}) else()