-
Notifications
You must be signed in to change notification settings - Fork 30
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
ign -> gz FindXXX migration : gz-cmake #273
Conversation
testing sdformat against this branch in macOS and windows CI using the |
Signed-off-by: methylDragon <[email protected]>
…#273) Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
c409c94
to
d120b80
Compare
…#273) Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
d120b80
to
4e88ed9
Compare
…#273) Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
4e88ed9
to
20132d1
Compare
…#273) Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
20132d1
to
77e83d2
Compare
…#273) Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
77e83d2
to
40755af
Compare
if(${PACKAGE_NAME_GZ}_FOUND) | ||
|
||
message(DEPRECATION "Ign prefixed package name [${PACKAGE_NAME}] is deprecated! Automatically using the Gz prefix instead: [${PACKAGE_NAME_GZ}]") | ||
set(PACKAGE_NAME ${PACKAGE_NAME_GZ}) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this change in PACKAGE_NAME
means there is no longer a matching ${PACKAGE_NAME}_pretty
variable, since that is set just before this code block. This could be fixed by moving that code block to after this if
logic
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, nice catch! It seems despite my best efforts I got bamboozled by macro substitution 😓
Fixed: 98aadc5
Upon approval, I'll squash all the non file-migration commits into one so when we rebase merge we'll just have two commits!
Signed-off-by: methylDragon <[email protected]>
Signed-off-by: methylDragon <[email protected]>
98aadc5
to
6e6b2f8
Compare
Signed-off-by: methylDragon <[email protected]>
See: gazebo-tooling/release-tools#698
NOTE: THIS MUST BE REBASE MERGED!! Files were moved!
Description
All
FindXXX.cmake
files have been hard migrated to Gz.Some downstream packages still use them via the
gz_find_package()
call, so an intercepting redirection of anyIgn
prefixed find calls toGz
has been implemented (with warning.)Hard-tocks
<Package_name>_FIND_VERSION_MINOR
CMake variables are being used (but populated automatically from thefind_package()
call, which might be the Gz or Ign version_FIND_VERSION_MINOR
var)XXX_FIND_COMPONENTS
Tick-tocks
set()
with an Ign prefix, just in case they'll be used downstreamNotes
gz_import_target
is being called to generate targets.The call itself is made of several components:
That is,
add_library()
call toGLOBAL
visibility.