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

aws-sdk-cpp: include dev output as header path hint #182918

Merged
merged 1 commit into from
Jul 24, 2023

Conversation

jonringer
Copy link
Contributor

@jonringer jonringer commented Jul 26, 2022

Description of changes

This includes the dev output in the hints to find the aws/core/Aws.h header.

Before this change, you would likely need to pass AWS_CORE_HEADER_FILE explicitly.

This is especially useful when using the find_package(AWSSDK) workflow.

Usage of individual targets is still pretty painless as install(TARGETS respects the $out + $dev split we do.

Related upstream issue: aws/aws-sdk-cpp#2009

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@r-burns r-burns left a comment

Choose a reason for hiding this comment

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

Nice fix, LGTM

@jonringer
Copy link
Contributor Author

Merging once green

@r-burns
Copy link
Contributor

r-burns commented Oct 15, 2022

Ping, merge conflict but still LGTM otherwise

@jonringer
Copy link
Contributor Author

rebased on master

@Artturin
Copy link
Member

Artturin commented Jul 20, 2023

Wrong indentation in the cmake file, but indentation in those are just visual AFAIK

94-        "C:/AWSSDK/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
95:    "/nix/store/ha5w42s778vvmr7liq5z4azjmwlx5c1h-aws-sdk-cpp-1.11.37-dev/include/aws/core"

@Artturin Artturin merged commit 5867d14 into NixOS:staging Jul 24, 2023
7 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants