Skip to content

Fix #69: use shiboken target over variable#77

Merged
dirk-thomas merged 1 commit intoros-visualization:kinetic-develfrom
no-preserve-root:kinetic-devel
Oct 24, 2019
Merged

Fix #69: use shiboken target over variable#77
dirk-thomas merged 1 commit intoros-visualization:kinetic-develfrom
no-preserve-root:kinetic-devel

Conversation

@no-preserve-root
Copy link
Copy Markdown
Contributor

@no-preserve-root no-preserve-root commented Oct 15, 2019

Fixes #69 and should be downward compatible.

@dirk-thomas
Copy link
Copy Markdown
Contributor

Thanks for the patch.

@dirk-thomas dirk-thomas merged commit e69d5f6 into ros-visualization:kinetic-devel Oct 24, 2019
@dirk-thomas
Copy link
Copy Markdown
Contributor

Cherry-picked to the crystal-devel branch: fa91148.

@stertingen
Copy link
Copy Markdown
Contributor

Although the variable SHIBOKEN_BINARY is now always correctly set, there are a few variables that are used but potentially empty:

  • SHIBOKEN_LIBRARY (lines 19, 20, 121, prevents output in line 20)
  • SHIKOBEN_PYTHON_LIBRARIES (line 120)
  • SHIBOKEN_INCLUDE_DIR (line 96)

@no-preserve-root
Copy link
Copy Markdown
Contributor Author

@stertingen you're right. I think that splitting the CMake file for shiboken2 >= 5.12.2 and one for the legacy version is the way to go; essentially, the CMake integration is fundamentally different and branching on the version is substantially easier than trying to emulate the legacy variables.

I might get a version to work over the next days and will submit a pull request then.

@dirk-thomas
Copy link
Copy Markdown
Contributor

there are a few variables that are used but potentially empty

See #78 for a new ticket about those.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

cmake file from new version of shiboken2 does not set SHIBOKEN_BINARY any more

3 participants