aboutsummaryrefslogtreecommitdiff
Help CMake find Clang's libraries.
Have it install the ICD file in the right place.

diff --git a/CMake/FindLLVM.cmake b/CMake/FindLLVM.cmake
index 5457f248..e8e8f94a 100644
--- a/CMake/FindLLVM.cmake
+++ b/CMake/FindLLVM.cmake
@@ -107,7 +107,7 @@ endif (LLVM_VERSION_NODOT VERSION_GREATER 34)
 macro(add_one_lib name)
   FIND_LIBRARY(CLANG_LIB
     NAMES ${name}
-    PATHS ${LLVM_LIBRARY_DIR} NO_DEFAULT_PATH)
+    PATHS ${CLANG_LIBRARY_DIR} NO_DEFAULT_PATH)
   set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB})
 	unset(CLANG_LIB CACHE)
 endmacro()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c11acbb2..fb99e5c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,7 +217,7 @@ IF(OCLIcd_FOUND)
     "intel-beignet.icd.in"
     "${ICD_FILE_NAME}"
   )
-  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors)
+  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION etc/OpenCL/vendors COMPONENT config)
 ELSE(OCLIcd_FOUND)
   MESSAGE(STATUS "Looking for OCL ICD header file - not found")
   MESSAGE(FATAL_ERROR "OCL ICD loader miss. If you really want to disable OCL ICD support, please run cmake with option -DOCLICD_COMPAT=0.")
--
2.14.3

er-highlight'> * gnu/packages/web-browsers.scm (sbcl-hu.dwim.defclass-star--no-nickname): New unexported package compatible with Nyxt 2 pre-release-5. (nyxt)[inputs]: Replace sbcl-hu.dwim.defclass-star by sbcl-hu.dwim.defclass-star--no-nickname. 2021-01-30guix: qt-build-system, qt-utils: Unify wrapping of qt-programs.Hartmut Goebel Unify (guix qt-build-system wrap-all-programs) and (guix qt-utils wrap-qt-program), so both behave the same. The functions now reside in qt-utils to make them easily available for packages not using the qt-build-system. * guix/build/qt-build-system.scm (variables-for-wrapping, wrap-all-programs): Move from here ... * guix/build/qt-utils.scm (variables-for-wrapping, wrap-all-qt-programs): ... to here. Base the later on (wrap-qt-program*): New function, carved out from old wrap-all-programs. (wrap-qt-program): Base on wrap-qt-program*, change arguments in an incompatible way. * gnu/packages/bittorrent.scm (qbittorrent)[arguments]<phases>{wrap-qt}: Adjust to new interface of wrap-qt-program. * gnu/packages/finance.scm (electron-cash): Likewise. * gnu/packages/geo.scm (qgis): Likewise. * gnu/packages/password-utils.scm (qtpass): Likewise. * gnu/packages/video.scm (openshot): Likewise. * gnu/packages/web-browsers.scm (kristall): Likewise. 2020-12-22gnu: nyxt: Update to 2-pre-release-5.Pierre Neidhardt * gnu/packages/web-browsers.scm (nyxt): Update to 2-pre-release-5. 2020-12-07gnu: bombadillo: Update to 2.3.3.Tobias Geerinckx-Rice * gnu/packages/web-browsers.scm (bombadillo): Update to 2.3.3. 2020-12-07gnu: qutebrowser: Update to 1.14.1.Tobias Geerinckx-Rice * gnu/packages/web-browsers.scm (qutebrowser): Update to 1.14.1. 2020-11-30gnu: Add gmni.Alexandru-Sergiu Marton * gnu/packages/web-browsers.scm (gmni): New variable. Signed-off-by: Christopher Baines <mail@cbaines.net> 2020-11-28Merge branch 'staging'Marius Bakke 2020-11-28gnu: qutebrowser: Fix QTWEBENGINEPROCESS_PATH wrapping.Sergey Trofimov Even thought this is named PATH, it's not a search path, instead the value is assumed to be the location of the executable. * gnu/packages/ebook.scm (calibre)[arguments]: Fix QTWEBENGINEPROCESS_PATH wrapping. Signed-off-by: Christopher Baines <mail@cbaines.net> 2020-11-15Merge branch 'master' into stagingMarius Bakke 2020-11-14gnu: Add kristall.nixo * gnu/packages/web-browsers.scm (kristall): New variable. Signed-off-by: Christopher Baines <mail@cbaines.net> 2020-11-11gnu: nyxt: Update to 2-pre-release-4.Pierre Neidhardt * gnu/packages/web-browsers.scm (nyxt): Update to 2-pre-release-4. 2020-11-09gnu: nyxt: Remove unused lparallel input.Pierre Neidhardt * gnu/packages/web-browsers.scm (nyxt)[inputs]: Remove sbcl-lparallel. 2020-11-07Merge branch 'master' into stagingMarius Bakke Conflicts: gnu/local.mk gnu/packages/gdb.scm gnu/packages/lisp-xyz.scm gnu/packages/web-browsers.scm 2020-10-25gnu: bombadillo: Update to 2.3.1.nixo * gnu/packages/web-browsers.scm (bombadillo): Update to 2.3.1. Signed-off-by: Leo Famulari <leo@famulari.name> 2020-10-23gnu: bombadillo: Don't try to copy LICENSE twice.raingloom * gnu/packages/web-browsers.scm (bombadillo)[arguments]: Removed install-file call for LICENSE. Signed-off-by: Christopher Baines <mail@cbaines.net> 2020-10-20gnu: nyxt: Update to 2-pre-release-3.Pierre Neidhardt * gnu/packages/web-browsers.scm (nyxt): Update to 2-pre-release-3. 2020-10-19Merge branch 'master' into stagingMarius Bakke 2020-10-17gnu: qutebrowser: Update to 1.14.0.Michael Rohleder * gnu/packages/web-browsers.scm (qutebrowser): Update to 1.14.0. Signed-off-by: Brett Gilio <brettg@gnu.org> 2020-10-16gnu: lynx: Update to 2.9.0dev.6.Brett Gilio * gnu/packages/web-browsers.scm (lynx): Update to 2.9.0dev.6. 2020-10-05Merge branch 'master' into stagingGuillaume Le Vaillant 2020-09-24gnu: nyxt: Update to 2-pre-release-2.Pierre Neidhardt * gnu/packages/web-browsers.scm (nyxt): Update to 2-pre-release-2. 2020-09-23gnu: nyxt: Use precompiled dependencies.Pierre Neidhardt * gnu/packages/web-browsers.scm (nyxt)[inputs]: Replace cl-* packages by sbcl-* packages. Signed-off-by: Guillaume Le Vaillant <glv@posteo.net> 2020-09-02gnu: nyxt: Update to 2-pre-release-1.Pierre Neidhardt * gnu/packages/web-browsers.scm (nyxt): Update to 2-pre-release-1. 2020-08-13gnu: luakit: Update to 2.2.Tobias Geerinckx-Rice * gnu/packages/web-browsers.scm (luakit): Update to 2.2. 2020-08-11gnu: links: Update to 2.21.Tobias Geerinckx-Rice * gnu/packages/web-browsers.scm (links): Update to 2.21. 2020-07-20gnu: qutebrowser: Update to 1.13.1.Tobias Geerinckx-Rice * gnu/packages/web-browsers.scm (qutebrowser): Update to 1.13.1. 2020-07-16gnu: bombadillo: Use HTTPS home page.Tobias Geerinckx-Rice * gnu/packages/web-browsers.scm (bombadillo)[home-page]: Use HTTPS. 2020-07-12gnu: Remove ".git" from "https://github/…/….git".Ludovic Courtès Until now, 'lookup-origin' and thus 'lookup-origin-revision' in (guix swh) would sometimes return #f for these because the ".git" URLs are redirects to the non-".git" URLs. Consequently, 'guix lint -c archival' would keep saying "scheduled Software Heritage archival"; likewise, the fallback download code would fail. * gnu/packages/ada.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm, gnu/packages/android.scm, gnu/packages/animation.scm, gnu/packages/arcan.scm, gnu/packages/assembly.scm, gnu/packages/audio.scm, gnu/packages/authentication.scm, gnu/packages/avr.scm, gnu/packages/axoloti.scm, gnu/packages/backup.scm, gnu/packages/bash.scm, gnu/packages/benchmark.scm, gnu/packages/bioconductor.scm, gnu/packages/bioinformatics.scm, gnu/packages/bittorrent.scm, gnu/packages/boost.scm, gnu/packages/build-tools.scm, gnu/packages/c.scm, gnu/packages/calendar.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/chemistry.scm, gnu/packages/chez.scm, gnu/packages/clojure.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/compton.scm, gnu/packages/coq.scm, gnu/packages/cpp.scm, gnu/packages/cran.scm, gnu/packages/crypto.scm, gnu/packages/curl.scm, gnu/packages/databases.scm, gnu/packages/datastructures.scm, gnu/packages/debug.scm, gnu/packages/disk.scm, gnu/packages/distributed.scm, gnu/packages/django.scm, gnu/packages/dlang.scm, gnu/packages/dns.scm, gnu/packages/docker.scm, gnu/packages/education.scm, gnu/packages/efi.scm, gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/embedded.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/erlang.scm, gnu/packages/fabric-management.scm, gnu/packages/file-systems.scm, gnu/packages/finance.scm, gnu/packages/firmware.scm, gnu/packages/flashing-tools.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/fpga.scm, gnu/packages/game-development.scm, gnu/packages/games.scm, gnu/packages/genealogy.scm, gnu/packages/genimage.scm, gnu/packages/geo.scm, gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/gnome-xyz.scm, gnu/packages/gnome.scm, gnu/packages/gnuzilla.scm, gnu/packages/golang.scm, gnu/packages/gpodder.scm, gnu/packages/graph.scm, gnu/packages/graphics.scm, gnu/packages/graphviz.scm, gnu/packages/groff.scm, gnu/packages/groovy.scm, gnu/packages/gtk.scm, gnu/packages/guile-xyz.scm, gnu/packages/guile.scm, gnu/packages/hardware.scm, gnu/packages/haskell-apps.scm, gnu/packages/haskell-xyz.scm, gnu/packages/hexedit.scm, gnu/packages/i2p.scm, gnu/packages/ibus.scm, gnu/packages/image-processing.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/ipfs.scm, gnu/packages/java-graphics.scm, gnu/packages/java-maths.scm, gnu/packages/java.scm, gnu/packages/javascript.scm, gnu/packages/jrnl.scm, gnu/packages/julia.scm, gnu/packages/jupyter.scm, gnu/packages/kodi.scm, gnu/packages/language.scm, gnu/packages/lego.scm, gnu/packages/less.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm, gnu/packages/lirc.scm, gnu/packages/lisp-xyz.scm, gnu/packages/llvm.scm, gnu/packages/logging.scm, gnu/packages/lolcode.scm, gnu/packages/lua.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/maths.scm, gnu/packages/maven.scm, gnu/packages/mes.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/node-xyz.scm, gnu/packages/ocaml.scm, gnu/packages/ocr.scm, gnu/packages/onc-rpc.scm, gnu/packages/opencl.scm, gnu/packages/opencog.scm, gnu/packages/pantheon.scm, gnu/packages/password-utils.scm, gnu/packages/patchutils.scm, gnu/packages/pdf.scm, gnu/packages/perl6.scm, gnu/packages/phabricator.scm, gnu/packages/popt.scm, gnu/packages/printers.scm, gnu/packages/prolog.scm, gnu/packages/protobuf.scm, gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python-xyz.scm, gnu/packages/qt.scm, gnu/packages/radio.scm, gnu/packages/rails.scm, gnu/packages/rdf.scm, gnu/packages/rednotebook.scm, gnu/packages/rpc.scm, gnu/packages/rsync.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/screen.scm, gnu/packages/security-token.scm, gnu/packages/selinux.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/shellutils.scm, gnu/packages/simh.scm, gnu/packages/sml.scm, gnu/packages/ssh.scm, gnu/packages/statistics.scm, gnu/packages/stenography.scm, gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/synergy.scm, gnu/packages/telephony.scm, gnu/packages/terminals.scm, gnu/packages/tex.scm, gnu/packages/texinfo.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tmux.scm, gnu/packages/tor.scm, gnu/packages/toys.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/virtualization.scm, gnu/packages/vlang.scm, gnu/packages/vnc.scm, gnu/packages/vpn.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm, gnu/packages/wireservice.scm, gnu/packages/wm.scm, gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, tests/lint.scm: Remove trailing ".git" from 'git-reference' URL. 2020-07-11gnu: qutebrowser: Update to 1.13.0.Michael Rohleder * gnu/packages/web-browsers.scm (qutebrowser): Update to 1.13.0. Signed-off-by: Julien Lepiller <julien@lepiller.eu> 2020-07-05gnu: links: Enable framebuffer (fb) graphics driver.Tobias Geerinckx-Rice * gnu/packages/web-browsers.scm (links)[native-inputs]: Add linux-libre-headers. [inputs]: Add gpm. 2020-07-05gnu: links: Sort inputs.Tobias Geerinckx-Rice * gnu/packages/web-browsers.scm (links)[inputs]: Order alphabetically. 2020-07-05gnu: Sort (gnu packages web-browsers) module imports.Tobias Geerinckx-Rice * gnu/packages/web-browsers.scm: Order module imports alphabetically. 2020-07-03gnu: nyxt (formerly 'next'): Update to 20200702.Pierre Neidhardt * gnu/packages/web-browsers.scm (next): Deprecate in favour of nyxt. (nyxt): New variable.