Skip to content

Fix finding R in CMake on Windows if old (side-by-side) version is present #19463

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 3 commits into from
Aug 25, 2025
Merged

Fix finding R in CMake on Windows if old (side-by-side) version is present #19463

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ff2128
Fix finding R in CMake one Windows if old version is present
Blake-Madden Jul 25, 2025
67a8f27
Unset variables if not matched yet
Blake-Madden Aug 23, 2025
4b6a9e3
Unset variables if not matched yet
Blake-Madden Aug 23, 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
12 changes: 10 additions & 2 deletions cmake/modules/FindR.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ if(WIN32 AND R_EXECUTABLE MATCHES "R_EXECUTABLE-NOTFOUND")
if(EXISTS "${RX64PATH}\\${R_VERSIONED_SUBDIR}\\bin\\x64\\Rscript.exe")
set(R_SCRIPT "${RX64PATH}\\${R_VERSIONED_SUBDIR}\\bin\\x64\\Rscript.exe")
endif()
break()
if (R_EXECUTABLE AND R_SCRIPT)
break()
endif()
unset(R_EXECUTABLE)
unset(R_SCRIPT)
endif()
endforeach()
# ...or the 32-bit installation
Expand All @@ -69,7 +73,11 @@ if(WIN32 AND R_EXECUTABLE MATCHES "R_EXECUTABLE-NOTFOUND")
if(EXISTS "${RX86PATH}\\${R_VERSIONED_SUBDIR}\\bin\\x86\\Rscript.exe")
set(R_SCRIPT "${RX86PATH}\\${R_VERSIONED_SUBDIR}\\bin\\x86\\Rscript.exe")
endif()
break()
if (R_EXECUTABLE AND R_SCRIPT)
break()
endif()
unset(R_EXECUTABLE)
unset(R_SCRIPT)
endif()
endforeach()
endif()
Expand Down
Loading