Skip to content

Commit

Permalink
FIx Test CMakeLists. image plugin was not linked (#8)
Browse files Browse the repository at this point in the history
* FIx CMakelists test

* up
  • Loading branch information
epernod authored May 25, 2023
1 parent 30efadc commit a855a82
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: CI

on:
workflow_dispatch:
pull_request:
push:

jobs:
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions CGALPlugin_test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
Expand Down

0 comments on commit a855a82

Please sign in to comment.