Skip to content

Commit a0f9264

Browse files
committed
[SKIP-CI ALL][ENABLE-CI PIXI] Restrict the CMake research to the Pixi environment for all CIs except the MSVC one for which we cannot because MSVC is not installed by Pixi
1 parent f868c2d commit a0f9264

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

development/scripts/pixi/activation.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export CMAKE_EXPORT_COMPILE_COMMANDS=1
88
export CMAKE_COLOR_DIAGNOSTICS=1
99

1010
# Set OS specific extra command CMake options, if any
11-
export VISP_EXTRA_CMAKE_ARGS=""
11+
export VISP_EXTRA_CMAKE_ARGS="-DCMAKE_FIND_ROOT_PATH=$CONDA_PREFIX -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY"
1212

1313
export VISP_BUILD_DIR=$CONDA_PREFIX/visp-build
1414
export VISP_USE_MATHJAX=${VISP_USE_MATHJAX:=OFF}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
:: Setup clang-cl compiler
22
:: Explicit path is necessary to avoid getting the clang-cl compiler installed on system
33
set CC="%CONDA_PREFIX%\\Library\\bin\\clang-cl"
4-
set CXX="%CONDA_PREFIX%\\Library\\bin\\clang-cl"
4+
set CXX="%CONDA_PREFIX%\\Library\\bin\\clang-cl"
5+
set VISP_EXTRA_CMAKE_ARGS=="%VISP_EXTRA_CMAKE_ARGS% -DCMAKE_FIND_ROOT_PATH=%CONDA_PREFIX% -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY"

0 commit comments

Comments
 (0)