Find gz-sim without major version #292
Conversation
* Update cmake project name, package.xml name * Change gz-launch executable target name to avoid conflict with library target name. Set the OUTPUT_NAME property to retain same executable file name. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Companion to gazebosim/gz-sim#2726. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
CMakeLists.txt
Outdated
| gz_find_package(gz-sim9 REQUIRED PRIVATE COMPONENTS gui) | ||
| set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR}) | ||
| gz_find_package(gz-sim REQUIRED PRIVATE COMPONENTS gui) | ||
| set(GZ_SIM_VER ${gz-sim_VERSION_MAJOR}) |
There was a problem hiding this comment.
we could alternatively delete the GZ_SIM_VER variable since I believe it is not used after these changes
this is failing because the base branch is still using |
…ers/package_name_without_major_version_sim
merged and resolved conflicts, trying again
|
…_without_major_version_sim
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
trying again after the fix in 4966abf
|
|
this job has finished the build successfully and is running tests
|
just finished! |
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
| # Find gz-sim | ||
| gz_find_package(gz-sim10 REQUIRED PRIVATE COMPONENTS gui) | ||
| set(GZ_SIM_VER ${gz-sim10_VERSION_MAJOR}) | ||
| gz_find_package(gz-sim REQUIRED PRIVATE COMPONENTS gui) |
There was a problem hiding this comment.
My personal opinion here is that a configuration instructions should encode the known versions that work and specially the versions that are known not to work.
If we know that this is going to fail with gz-sim less than 10, let's encode it.
| gz_find_package(gz-sim REQUIRED PRIVATE COMPONENTS gui) | |
| gz_find_package(gz-sim REQUIRED VERSION 10 PRIVATE COMPONENTS gui) |
There was a problem hiding this comment.
I had suggested in the shorter proposal gazebo-tooling/release-tools#1244 (comment) that we not use explicit version numbers when calling find_package on the main branch, but that we add it in when creating stable release branches
- Finding Gazebo packages with cmake's
find_packagefunction:
- On
mainbranches: the major version number should not be used when finding a package with cmake’sfind_package()function. For example: find_package(gz-utils4 REQUIRED COMPONENTS log) should instead befind_package(gz-utils REQUIRED COMPONENTS log). This helps reduce maintenance churn on themainbranches.- When branching from
mainto create stable release branches: add explicit major versions into thefind_packagecalls likefind_package(gz-utils 4 REQUIRED COMPONENTS log). This generates configuration errors when incompatible versions are built together, which is helpful.
I think this will reduce churn on the main branches, while still providing helpful error messages for stable release branches
There was a problem hiding this comment.
ah sorry, did not get that in mind. Sound fine.
2 participants
🎉 New feature
Part of gazebo-tooling/release-tools#1244, companion to gazebosim/gz-sim#2726.
Summary
The major version is removed from the cmake project name for gz-sim in gazebosim/gz-sim#2726, so update the
find_packageandtarget_link_librariescalls accordingly.Test it
Checklist
codecheckpassed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-bymessages.