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.

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

[workspace] Remove determine_os logic #21089

Merged

Conversation

jwnimmer-tri
Copy link
Collaborator

@jwnimmer-tri jwnimmer-tri commented Mar 4, 2024

Centralize choice of C++20 to be project-wide, instead of OS-specific.

Simplify CMakeLists to use whatever OS codename it finds for the bazel customizations, with only warnings (not errors) when none is found.

Overall, these changes remove some barriers to building Drake on non-Ubuntu linuxen.

Towards #14967.


This change is Reviewable

@jwnimmer-tri jwnimmer-tri added priority: low release notes: feature This pull request contains a new feature labels Mar 4, 2024
@jwnimmer-tri
Copy link
Collaborator Author

@drake-jenkins-bot linux-jammy-unprovisioned-gcc-wheel-experimental-release please
@drake-jenkins-bot mac-arm-ventura-unprovisioned-clang-wheel-experimental-release please

@jwnimmer-tri jwnimmer-tri marked this pull request as ready for review March 4, 2024 19:59
@jwnimmer-tri
Copy link
Collaborator Author

+@mwoehlke-kitware or +@svenevs perhaps one of you has time for a feature review here? If so, please go ahead (and un-assign the ).

Copy link
Contributor

@mwoehlke-kitware mwoehlke-kitware left a comment

Choose a reason for hiding this comment

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

:lgtm: aside from a stray \t.

Reviewed 9 of 10 files at r1, all commit messages.
Reviewable status: 1 unresolved discussion, LGTM missing from assignee svenevs, needs platform reviewer assigned


CMakeLists.txt line 72 at r1 (raw file):

      set(MAYBE_RC "tools/ubuntu-${UNIX_DISTRIBUTION_CODENAME}.bazelrc")
      if(NOT EXISTS "${PROJECT_SOURCE_DIR}/${MAYBE_RC}")
	message(WARNING "Could NOT find config file ${MAYBE_RC}")

Suggestion:

        message

Centralize choice of C++20 to be project-wide, instead of OS-specific.

Simplify CMakeLists to use whatever OS codename it finds for the bazel
customizations, with only warnings (not errors) when none is found.

Overall, these changes remove some barriers to building Drake on
non-Ubuntu linuxen.
@jwnimmer-tri jwnimmer-tri force-pushed the os-portability-pkgconfig branch from 47a9f25 to 0b20c2b Compare March 4, 2024 20:59
Copy link
Collaborator Author

@jwnimmer-tri jwnimmer-tri left a comment

Choose a reason for hiding this comment

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

+@SeanCurtis-TRI for platform review per schedule, please.

Dismissed @mwoehlke-kitware from a discussion.
Reviewable status: LGTM missing from assignee SeanCurtis-TRI(platform)


CMakeLists.txt line 72 at r1 (raw file):

      set(MAYBE_RC "tools/ubuntu-${UNIX_DISTRIBUTION_CODENAME}.bazelrc")
      if(NOT EXISTS "${PROJECT_SOURCE_DIR}/${MAYBE_RC}")
	message(WARNING "Could NOT find config file ${MAYBE_RC}")

Done.

Copy link
Contributor

@mwoehlke-kitware mwoehlke-kitware left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r2, all commit messages.
Reviewable status: LGTM missing from assignee SeanCurtis-TRI(platform)

Copy link
Contributor

@SeanCurtis-TRI SeanCurtis-TRI left a comment

Choose a reason for hiding this comment

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

:LGTM:

Reviewed 9 of 10 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: :shipit: complete! all discussions resolved, LGTM from assignees SeanCurtis-TRI(platform),mwoehlke-kitware

@SeanCurtis-TRI SeanCurtis-TRI merged commit 0e2b6ae into RobotLocomotion:master Mar 4, 2024
10 checks passed
@jwnimmer-tri jwnimmer-tri deleted the os-portability-pkgconfig branch March 4, 2024 22:08
cohnt added a commit to cohnt/drake that referenced this pull request Mar 6, 2024
jwnimmer-tri added a commit to jwnimmer-tri/drake that referenced this pull request Apr 1, 2024
Centralize choice of C++20 to be project-wide, instead of OS-specific.

Simplify CMakeLists to use whatever OS codename it finds for the bazel
customizations, with only warnings (not errors) when none is found.

Overall, these changes remove some barriers to building Drake on
non-Ubuntu linuxen.
RussTedrake pushed a commit to RussTedrake/drake that referenced this pull request Dec 15, 2024
Centralize choice of C++20 to be project-wide, instead of OS-specific.

Simplify CMakeLists to use whatever OS codename it finds for the bazel
customizations, with only warnings (not errors) when none is found.

Overall, these changes remove some barriers to building Drake on
non-Ubuntu linuxen.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority: low release notes: feature This pull request contains a new feature
Development

Successfully merging this pull request may close these issues.

4 participants