mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-24 22:04:20 +00:00
571c71e6f7
We are migrating packages that meet below requirements: 1. using `callPackage` 2. called path is a directory 3. overriding set is empty (`{ }`) 4. not containing path expressions other than relative path (to makenixpkgs-vet happy) 5. not referenced by nix files outside of the directory, other than`pkgs/top-level/all-packages.nix` 6. not referencing nix files outside of the directory 7. not referencing `default.nix` (since it's changed to `package.nix`) 8. `outPath` doesn't change after migration The tool is here: https://github.com/Aleksanaa/by-name-migrate.
26 lines
920 B
Diff
26 lines
920 B
Diff
diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
|
|
index 3dd2ea4..aeae6e9 100644
|
|
--- a/cl_headers/CMakeLists.txt
|
|
+++ b/cl_headers/CMakeLists.txt
|
|
@@ -11,12 +11,14 @@ add_custom_command(
|
|
)
|
|
endfunction(copy_file)
|
|
|
|
-if(USE_PREBUILT_LLVM)
|
|
- set(OPENCL_HEADERS_DIR
|
|
- "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
|
|
-else(USE_PREBUILT_LLVM)
|
|
- set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers")
|
|
-endif(USE_PREBUILT_LLVM)
|
|
+if(NOT DEFINED OPENCL_HEADERS_DIR)
|
|
+ if(USE_PREBUILT_LLVM)
|
|
+ set(OPENCL_HEADERS_DIR
|
|
+ "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
|
|
+ else(USE_PREBUILT_LLVM)
|
|
+ set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers")
|
|
+ endif(USE_PREBUILT_LLVM)
|
|
+endif()
|
|
copy_file(${OPENCL_HEADERS_DIR}/opencl-c.h opencl-c.h)
|
|
|
|
add_custom_target (
|