From 68cab68c5b2120ada4fcdf9fb67bbb72f5b4e48f Mon Sep 17 00:00:00 2001 From: Fabien Spindler Date: Wed, 5 Jul 2023 17:20:11 +0200 Subject: [PATCH] Fix ci visp_sample build using visp-config script --- .github/workflows/macos.yml | 5 +++-- .github/workflows/ubuntu-dep-apt.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index cf987c6737..da6a0f65ba 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -111,7 +111,8 @@ jobs: run: | cd ${HOME}/visp_sample export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/tmp/usr/local/lib/pkgconfig - /tmp/usr/local/bin/visp-config --cflags - /tmp/usr/local/bin/visp-config --libs + export VISP_INSTALL_PREFIX=/tmp/usr/local + $VISP_INSTALL_PREFIX/bin/visp-config --cflags + $VISP_INSTALL_PREFIX/bin/visp-config --libs make -j$(sysctl -n hw.logicalcpu) -f Makefile.visp-config make -j$(sysctl -n hw.logicalcpu) -f Makefile.visp-config clean diff --git a/.github/workflows/ubuntu-dep-apt.yml b/.github/workflows/ubuntu-dep-apt.yml index 32c2dfe5ca..99dffa743b 100644 --- a/.github/workflows/ubuntu-dep-apt.yml +++ b/.github/workflows/ubuntu-dep-apt.yml @@ -104,9 +104,10 @@ jobs: run: | cd ${HOME}/visp_sample export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/tmp/usr/local/lib/pkgconfig + export VISP_INSTALL_PREFIX=/tmp/usr/local CC=${{ matrix.compiler.CC }} CXX=${{ matrix.compiler.CXX }} - /tmp/usr/local/bin/visp-config --cflags - /tmp/usr/local/bin/visp-config --libs + $VISP_INSTALL_PREFIX/bin/visp-config --cflags + $VISP_INSTALL_PREFIX/bin/visp-config --libs make CXX=${{ matrix.compiler.CXX }} -j$(nproc) -f Makefile.visp-config make CXX=${{ matrix.compiler.CXX }} -j$(nproc) -f Makefile.visp-config clean