Hello, As suggested in https://bugs.freedesktop.org/show_bug.cgi?id=98885 , here is a Git-friendly patch which makes CMake looking for OCL ICD header files depend on a new configuration option, so that the loader compatibility mode can be explicitly disabled.
All the best, -- MS
From 011609930c09995b13d89bb3f9249f1197fe28c7 Mon Sep 17 00:00:00 2001 From: Marek Szuba <marek.sz...@cern.ch> Date: Thu, 1 Dec 2016 13:15:11 +0100 Subject: [PATCH] Add a CMake option for toggling OCL ICD Loader compatibility The new option allows anyone wishing to do so to explicitly disable OCL ICD Loader support in Beignet, regardless of the presence or absence of OCL ICD header files. This is particularly useful for people building Beignet packages for distributions, as it avoids creating an implicit dependency on the state of the build host. The new option defaults to ON so the default behaviour of CMake configuration remains unchanged. See also: https://bugs.freedesktop.org/show_bug.cgi?id=98885 --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 713cfa9..09b5734 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,6 +221,8 @@ IF(ENABLE_GL_SHARING) ENDIF(EGL_FOUND) ENDIF(ENABLE_GL_SHARING) +OPTION(OCLICD_COMPAT "OCL ICD compatibility mode" ON) +IF(OCLICD_COMPAT) Find_Package(OCLIcd) IF(OCLIcd_FOUND) MESSAGE(STATUS "Looking for OCL ICD header file - found") @@ -232,6 +234,7 @@ IF(OCLIcd_FOUND) ELSE(OCLIcd_FOUND) MESSAGE(STATUS "Looking for OCL ICD header file - not found") ENDIF(OCLIcd_FOUND) +ENDIF(OCLICD_COMPAT) Find_Package(PythonInterp) -- 2.7.3
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Beignet mailing list Beignet@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/beignet
