Skip to content

Fix CMAKE_ARGS variable expansion #101

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
h-vetinari merged 3 commits into from
Jul 21, 2025
Merged

Fix CMAKE_ARGS variable expansion #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa02ce4
fix delayed variable expansion for CMAKE_ARGS
olivier-roussel Jul 21, 2025
aade5c7
bump build number
olivier-roussel Jul 21, 2025
b4f2ca7
apply delayed expansion on CMAKE_ARGS
olivier-roussel Jul 21, 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
3 changes: 2 additions & 1 deletion recipe/activate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@@echo on
setlocal EnableDelayedExpansion

:: Set env vars that tell distutils to use the compiler that we put on path
SET DISTUTILS_USE_SDK=1
Expand Down Expand Up @@ -91,7 +92,7 @@ set "CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release"
IF "%CONDA_BUILD%" == "1" (
set "CMAKE_ARGS=%CMAKE_ARGS% -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DCMAKE_PROGRAM_PATH=%BUILD_PREFIX%\bin;%BUILD_PREFIX%\Scripts;%BUILD_PREFIX%\Library\bin;%PREFIX%\bin;%PREFIX%\Scripts;%PREFIX%\Library\bin"
:: see https://github.com/conda-forge/conda-smithy/issues/2319
set "CMAKE_ARGS=%CMAKE_ARGS% -DPython_FIND_REGISTRY=NEVER -DPython3_FIND_REGISTRY=NEVER"
set "CMAKE_ARGS=!CMAKE_ARGS! -DPython_FIND_REGISTRY=NEVER -DPython3_FIND_REGISTRY=NEVER"
)

IF NOT "@{target_platform}" == "@{host_platform}" (
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{% set vcvars_ver_maj = cl_version.split(".")[0]|int - 5 %}
{% set vcvars_ver_min = cl_version.split(".")[1]|int %}
{% set vcvars_ver = vcvars_ver_maj ~ "." ~ vcvars_ver_min %}
{% set build_num = 28 %}
{% set build_num = 29 %}

package:
name: vs{{ vsyear }}
Expand Down