Skip to content

Fix: Always use conda clang-cl #1809

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

Merged
merged 13 commits into from
Oct 31, 2025
Merged

Fix: Always use conda clang-cl #1809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
29b4c81
Always use conda clang-cl
olivier-roussel Oct 27, 2025
26223aa
add lld linker dep
olivier-roussel Oct 27, 2025
816891c
debugging
olivier-roussel Oct 27, 2025
2ad7db3
debugging
olivier-roussel Oct 27, 2025
d756de7
debugging
olivier-roussel Oct 27, 2025
c816c57
debugging
olivier-roussel Oct 27, 2025
391eb28
debugging
olivier-roussel Oct 27, 2025
4f40324
bump to fixed version (build num =5) of panda3d on panda3d-forge
olivier-roussel Oct 28, 2025
4739931
bump panda3d package and switch to prefix.dev channel
olivier-roussel Oct 29, 2025
2c9752b
fix python pinning version feature
olivier-roussel Oct 29, 2025
d205176
revert macos-15-intel bump for now
olivier-roussel Oct 30, 2025
9fb6480
remove temporary build-number fix for panda3d
olivier-roussel Oct 30, 2025
5ce5a48
Merge branch 'master' into fix-clang-cl-pixi
olivier-roussel Oct 31, 2025
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
5 changes: 3 additions & 2 deletions development/scripts/pixi/activation_clang_cl.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
:: Setup clang-cl compiler
set CC=clang-cl
set CXX=clang-cl
:: Explicit path is necessary to avoid getting the clang-cl compiler installed on system
set CC="%CONDA_PREFIX%\\Library\\bin\\clang-cl"
set CXX="%CONDA_PREFIX%\\Library\\bin\\clang-cl"
75 changes: 58 additions & 17 deletions pixi.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ VISP_USE_GTK2 = "ON"
# to avoid cxx-compiler to overwrite them.
[feature.clang-cl]
platforms = ["win-64"]
dependencies = { clang = "*", llvm-openmp = "*" }
dependencies = { clangxx = "*", lld = "*", llvm-openmp = "*"}
activation = { scripts = ["development/scripts/pixi/activation_clang_cl.bat"] }

[feature.py310]
Expand Down Expand Up @@ -162,6 +162,7 @@ VISP_BUILD_TUTORIALS = "ON"

[tasks]
init-testing = {}
echo-env = { cmd = "env" }
configure = { cmd = [
"cmake",
"-G",
Expand All @@ -184,7 +185,7 @@ configure = { cmd = [
"-DDOXYGEN_AWESOME_DIR=$DOXYGEN_AWESOME_DIR",

"$VISP_EXTRA_CMAKE_ARGS"
] }
], depends-on = ["echo-env"] }
build-modules = { cmd = "cmake --build $VISP_BUILD_DIR --target visp_modules --parallel $CPU_COUNT", depends-on = ["configure"] }
build-base = { cmd = "cmake --build $VISP_BUILD_DIR --parallel $CPU_COUNT", depends-on = ["build-modules"] }
build = { depends-on = ["build-base"]}
Expand Down
Loading