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

Tiny Changes for Fast-DDS + Add version 2.3.3 #6429

Merged
merged 4 commits into from
Jul 28, 2021
Merged

Tiny Changes for Fast-DDS + Add version 2.3.3 #6429

merged 4 commits into from
Jul 28, 2021

Conversation

dotChris90
Copy link
Contributor

Specify library name and version: fast-dds/2.3.2 + fast-dds/2.3.3

patches:
"2.3.2":
- base_path: "source_subfolder"
patch_file: "patches/2.3.2-0001-fix-find-asio-and-tinyxml2.patch"
"2.3.3":
- base_path: "source_subfolder"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

not sure what is here official process - 2.3.3 dont need patch - so i just gave the base_path but not the patch_file

Copy link
Contributor

Choose a reason for hiding this comment

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

Ha, didn't know that works. Nice hack.

Anyway, the normal/official way is to don't add the version in patches and do the following in conanfile.py.

for patch in self.conan_data.get("patches", {}).get(self.version, []):
    tools.patch(**patch)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks for info - but i found out i have to patch again - i was missing my checks inside container .... so it took tinyxml from system .... so still have to add patch. ^^'

@conan-center-bot

This comment has been minimized.

@dotChris90
Copy link
Contributor Author

my fault - i should have checked them in container ... tinyxml is on my system -.-

@conan-center-bot

This comment has been minimized.

@dotChris90 dotChris90 mentioned this pull request Jul 21, 2021
4 tasks
self.env_info.PATH.append(bin_path)
# component tools
self.cpp_info.components["tools"].name = "tools"
self.cpp_info.components["tools"].names["cmake_find_package"] = "tools"
Copy link
Contributor

Choose a reason for hiding this comment

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

The name here is a little generic... maybe?

Suggested change
self.cpp_info.components["tools"].names["cmake_find_package"] = "tools"
self.cpp_info.components["fast-dds-tools"].names["cmake_find_package"] = "tools"

@SSE4 SSE4 closed this Jul 28, 2021
@SSE4 SSE4 reopened this Jul 28, 2021
@conan-center-bot
Copy link
Collaborator

All green in build 3 (f2c12bd1947119e9763859368bfcc7afd483f88e):

  • fast-dds/2.3.3@:
    All packages built successfully! (All logs)

  • fast-dds/2.3.2@:
    All packages built successfully! (All logs)

@conan-center-bot conan-center-bot merged commit 49b5239 into conan-io:master Jul 28, 2021
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.

6 participants