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 globbing of single files on export #10416

Merged
merged 1 commit into from Sep 7, 2016

Conversation

@fetzerch
Copy link
Member

commented Sep 6, 2016

GLOB_RECURSE when called with a file name will list all files with the given name in all subdirectories. This is unintuitive for files specified in installdata. Here if a full file name is specified only that single file should be mirrored/installed. Since we mirror them to the same directory, files are overridden and the last file wins.

Fixes installation of certificates as mentioned in #10108 (comment)
Ping: @Memphiz, @wsnipex, @hudokkow

GLOB_RECURSE when called with a file name will list all files with the
given name in all subdirectories. This is unintuitive for files
specified in installdata. Here if a full file name is specified only
that single file should be mirrored/installed.

Example: tools/depends/target/openssl/cacert.pem
Current behavior, mirrors:
 - tools/depends/target/openssl/cacert.pem
 - tools/depends/target/openssl/iphoneos8.1_armv7-target/apps/demoCA/cacert.pem
 - tools/depends/target/openssl/iphoneos8.1_armv7-target/demos/cms/cacert.pem
 - tools/depends/target/openssl/iphoneos8.1_armv7-target/demos/smime/cacert.pem

Intended behavior, mirror only:
 - tools/depends/target/openssl/cacert.pem
@fetzerch

This comment has been minimized.

Copy link
Member Author

commented Sep 6, 2016

jenkins build this please

@Memphiz

This comment has been minimized.

Copy link
Member

commented Sep 7, 2016

Looks good to me - thx for the quick fix :)

@wsnipex

This comment has been minimized.

Copy link
Member

commented Sep 7, 2016

looks good

@fetzerch fetzerch merged commit 11c2a03 into xbmc:master Sep 7, 2016
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
jenkins.kodi.tv You did a great job. Have a cookie.
Details
@fetzerch fetzerch deleted the fetzerch:cmake_fix_mirroring branch Sep 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.