diff options
| author | Zhigang Gong <zhigang.gong@intel.com> | 2014-01-14 09:33:00 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@intel.com> | 2014-01-14 09:36:38 +0800 |
| commit | a979dcc2f4290f9c39459abbee0eca9adbcdff4c (patch) | |
| tree | b691d21c706a67b16b57e5f38ebf73daa46c1c52 /CMakeLists.txt | |
| parent | e427b3eac67a9513eae4a0d352ed94d798cc7334 (diff) | |
| download | beignet-a979dcc2f4290f9c39459abbee0eca9adbcdff4c.tar.gz | |
Revert faulty pushed patchset
This reverts:
Revert "GBE: fixed a long related bug."
Revert "Refine the method to find pch and pcm files."
Revert "GBE: enable relocatable pch files."
Revert "CL: prepare to support ICD if the system has ocl-icd.."
Revert "CL: back port ICD support to 1.1 branch."
The above patches are merged by accident without review comments and
are broken. Now revert them.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e588829f..b44e7a68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,12 +18,6 @@ configure_file ( "src/OCLConfig.h" ) -configure_file ( - "intel-beignet.icd.in" - "intel-beignet.icd" -) - - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) SET(CMAKE_VERBOSE_MAKEFILE "false") @@ -117,6 +111,14 @@ ELSE(XFIXES_FOUND) MESSAGE(STATUS "Looking for Xfixes - not found") ENDIF(XFIXES_FOUND) +# Gen-backend (compiler) +Find_Package(GBE) +IF(GBE_FOUND) + MESSAGE(STATUS "Looking for Gen-Backend - found") +ELSE(GBE_FOUND) + MESSAGE(STATUS "Looking for Gen-Backend - not found") +ENDIF(GBE_FOUND) + Find_Package(EGL) IF(EGL_FOUND) MESSAGE(STATUS "Looking for EGL - found") @@ -133,7 +135,6 @@ ENDIF(MESA_SOURCE_FOUND) Find_Package(OCLIcd) IF(OCLIcd_FOUND) MESSAGE(STATUS "Looking for OCL ICD header file - found") - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/intel-beignet.icd DESTINATION /etc/OpenCL/vendors) ELSE(OCLIcd_FOUND) MESSAGE(STATUS "Looking for OCL ICD header file - not found") ENDIF(OCLIcd_FOUND) @@ -144,3 +145,4 @@ ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(backend) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(utests) + |