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

cmake: Fix python3 search for CMake 3.10 (Ubuntu 18.04) #14798

Merged
merged 1 commit into from Mar 18, 2021

Conversation

jwnimmer-tri
Copy link
Collaborator

@jwnimmer-tri jwnimmer-tri commented Mar 18, 2021

This was broken in #14605.

Closes #14796.


This change is Reviewable

@jwnimmer-tri jwnimmer-tri added priority: high component: build system Bazel, CMake, dependencies, memory checkers, linters labels Mar 18, 2021
@jwnimmer-tri
Copy link
Collaborator Author

+@jamiesnape for feature review, please.

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.

+@SeanCurtis-TRI for platform.

:LGTM:

Reviewed 1 of 1 files at r1.
Reviewable status: LGTM missing from assignee jamiesnape (waiting on @jamiesnape)

Copy link
Contributor

@jamiesnape jamiesnape left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 unresolved discussion, LGTM missing from assignee jamiesnape (waiting on @jwnimmer-tri)


CMakeLists.txt, line 225 at r1 (raw file):

  find_program(PYTHON_EXECUTABLE NAMES "${FIND_PROGRAM_PYTHON3_NAMES}"
    PATHS "${FIND_PROGRAM_PYTHON3_PATHS}"
    NO_DEFAULT_PATH

What I intended was NO_DEFAULT_PATH to be removed. Somehow we ended up with some duplicate code in the two branches (obviously my fault).

Copy link
Contributor

@jamiesnape jamiesnape left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 unresolved discussion, LGTM missing from assignee jamiesnape (waiting on @jwnimmer-tri)


CMakeLists.txt, line 225 at r1 (raw file):

Previously, jamiesnape (Jamie Snape) wrote…

What I intended was NO_DEFAULT_PATH to be removed. Somehow we ended up with some duplicate code in the two branches (obviously my fault).

(semi-duplicated, I guess, the case is important, but maybe there is a better way to handle it)

Copy link
Contributor

@jamiesnape jamiesnape left a comment

Choose a reason for hiding this comment

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

So, it is unlikely Mac would be using an old version, but it would technically be broken too. My preference is just remove NO_DEFAULT_PATH below.

Reviewable status: 1 unresolved discussion, LGTM missing from assignee jamiesnape (waiting on @jwnimmer-tri)

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.

Reviewable status: 1 unresolved discussion, LGTM missing from assignee jamiesnape (waiting on @jamiesnape and @SeanCurtis-TRI)


CMakeLists.txt, line 225 at r1 (raw file):

Previously, jamiesnape (Jamie Snape) wrote…

(semi-duplicated, I guess, the case is important, but maybe there is a better way to handle it)

Done.

Copy link
Contributor

@jamiesnape jamiesnape left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! all discussions resolved, LGTM from assignees SeanCurtis-TRI(platform),jamiesnape (waiting on @SeanCurtis-TRI)

@jwnimmer-tri jwnimmer-tri merged commit dd18fde into RobotLocomotion:master Mar 18, 2021
@jwnimmer-tri jwnimmer-tri deleted the cmake-3.10-python branch March 18, 2021 22:30
@jamiesnape jamiesnape removed their assignment Jun 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: build system Bazel, CMake, dependencies, memory checkers, linters priority: high
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cmake build fails on commit b562211
3 participants