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

opencl-headers: use cmake build #254870

Merged
merged 1 commit into from
Dec 18, 2023
Merged

Conversation

lelgenio
Copy link

Description of changes

Fixes: #252601

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/)
  • 23.11 Release Notes (or backporting 23.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
  • Fits CONTRIBUTING.md.

@lelgenio
Copy link
Author

$ tree result-old/
result
└── include
   └── CL
      ├── cl.h
      ├── cl_d3d10.h
      ├── cl_d3d11.h
      ├── cl_dx9_media_sharing.h
      ├── cl_dx9_media_sharing_intel.h
      ├── cl_egl.h
      ├── cl_ext.h
      ├── cl_ext_intel.h
      ├── cl_gl.h
      ├── cl_gl_ext.h
      ├── cl_half.h
      ├── cl_icd.h
      ├── cl_layer.h
      ├── cl_platform.h
      ├── cl_va_api_media_sharing_intel.h
      ├── cl_version.h
      └── opencl.h

$ tree result-new/
result
├── include
│  └── CL
│     ├── cl.h
│     ├── cl_d3d10.h
│     ├── cl_d3d11.h
│     ├── cl_dx9_media_sharing.h
│     ├── cl_dx9_media_sharing_intel.h
│     ├── cl_egl.h
│     ├── cl_ext.h
│     ├── cl_ext_intel.h
│     ├── cl_gl.h
│     ├── cl_gl_ext.h
│     ├── cl_half.h
│     ├── cl_icd.h
│     ├── cl_layer.h
│     ├── cl_platform.h
│     ├── cl_va_api_media_sharing_intel.h
│     ├── cl_version.h
│     └── opencl.h
├── lib
│  └── pkgconfig
│     └── OpenCL-Headers.pc
└── share
   └── cmake
      └── OpenCLHeaders
         ├── OpenCLHeadersConfig.cmake
         ├── OpenCLHeadersConfigVersion.cmake
         └── OpenCLHeadersTargets.cmake

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/2694

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

The commit should probably contain something in the form of that we switched to cmake to install those files

This is makes the build process simpler and exports .cmake
and pkg-config(.pc) files
@lelgenio lelgenio changed the title opencl-headers: export cmake and pkg-config files opencl-headers: use cmake build Sep 28, 2023
@marsam marsam merged commit 433d476 into NixOS:master Dec 18, 2023
23 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.

opencl-headers: export pkg-config pc file
5 participants