Skip to content
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

Jump to bottom

Fix MacOS configuration regex. #3297

Merged
merged 3 commits into from
Nov 4, 2022
Merged

Fix MacOS configuration regex. #3297

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21006a2
Fix MacOS configuration regex.
rcurtin Oct 25, 2022
28be9de
Use adjusted regex.
rcurtin Nov 3, 2022
399dba7
Merge remote-tracking branch 'origin/master' into fix-macos-regex
rcurtin Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,12 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
exec_program(/usr/bin/sw_vers ARGS
-productVersion OUTPUT_VARIABLE MACOSX_VERSION_RAW)
string(REGEX REPLACE
"([0-9]+)(?:\\.([0-9]+).*)*" "\\1"
"([0-9]+)(\\.([0-9]+).*)*" "\\1"
MACOSX_MAJOR_VERSION
"${MACOSX_VERSION_RAW}")

string(REGEX REPLACE
"([0-9]+)(?:\\.([0-9]+).*)*" "\\2"
"([0-9]+)\\.([0-9]+)(\\.([0-9]+).*)*" "\\2"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use "([0-9]+)(\\.([0-9]+).*)*" "\\3" instead. Maybe it will help in version string like 10

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe I misunderstood the original regex---I thought the idea here was to capture the second (minor) version number. So wouldn't it suffice to split out the second ([0-9]+) capture group and use that, and leave the (\\.([0-9]+).*)* to capture (and leave unused) any additional terms in the version number?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the purpose of this regex is to get the second (minor) version number if it exists. Before this fix, we used forced major version 10 and then a minor number. But after that fix, we also took care of major version 11. Now, I don't remember whether it would not break if we didn't include cases with no minor number like "11".

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the explanation; fixed in 28be9de. I tested this and it seems to work fine. 👍

MACOSX_MINOR_VERSION
"${MACOSX_VERSION_RAW}")

Expand Down