diff options
| author | Zhigang Gong <zhigang.gong@linux.intel.com> | 2013-09-17 17:35:29 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@linux.intel.com> | 2013-09-18 15:33:05 +0800 |
| commit | 04f8ef8880b2b660ecc19046a87a6bce3939aefa (patch) | |
| tree | b600a262ce7bb0fce701abb33fb485e042d4f2f3 /CMake | |
| parent | 4cd17390703412add90c1ebd7e7ae3cb7a998b4c (diff) | |
| download | beignet-04f8ef8880b2b660ecc19046a87a6bce3939aefa.tar.gz | |
Refine cmake script file.
Remove GBM which is not needed. Adjust the header file including
sequence to avoid including incorrect cl header file when compile
with mesa source code package.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Tested-by: "Yang, Rong R" <rong.r.yang@intel.com>
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/FindEGL.cmake | 6 | ||||
| -rw-r--r-- | CMake/FindGBM.cmake | 36 |
2 files changed, 5 insertions, 37 deletions
diff --git a/CMake/FindEGL.cmake b/CMake/FindEGL.cmake index 6caed56b..d84ef955 100644 --- a/CMake/FindEGL.cmake +++ b/CMake/FindEGL.cmake @@ -41,7 +41,11 @@ FIND_PATH(MESA_SOURCE_PREFIX src/mesa/main/texobj.c DOC "The mesa source directory which is needed for cl_khr_gl_sharing.") IF(MESA_SOURCE_PREFIX) -SET(MESA_SOURCE_INCLUDES "-I${MESA_SOURCE_PREFIX}/src/mesa -I${MESA_SOURCE_PREFIX}/include -I${MESA_SOURCE_PREFIX}/src/mapi -I${MESA_SOURCE_PREFIX}/src/mesa/drivers/dri/i965/ -I${MESA_SOURCE_PREFIX}/src/mesa/drivers/dri/common/") +SET(MESA_SOURCE_INCLUDES ${MESA_SOURCE_PREFIX}/src/mesa + ${MESA_SOURCE_PREFIX}/include + ${MESA_SOURCE_PREFIX}/src/mapi + ${MESA_SOURCE_PREFIX}/src/mesa/drivers/dri/i965/ + ${MESA_SOURCE_PREFIX}/src/mesa/drivers/dri/common/) SET(MESA_SOURCE_FOUND 1 CACHE STRING "Set to 1 if mesa source code is found, 0 otherwise") ELSE(MESA_SOURCE_PREFIX) SET(MESA_SOURCE_FOUND 0 CACHE STRING "Set to 1 if mesa source code is found, 0 otherwise") diff --git a/CMake/FindGBM.cmake b/CMake/FindGBM.cmake deleted file mode 100644 index f20f4b29..00000000 --- a/CMake/FindGBM.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# -# Try to find gbm library and include path. -# Once done this will define -# -# GBM_FOUND -# GBM_INCLUDE_PATH -# GBM_LIBRARY -# - -FIND_PATH(GBM_INCLUDE_PATH gbm.h - ~/include/ - /usr/include/ - /usr/local/include/ - /sw/include/ - /opt/local/include/ - DOC "The directory where gen/program.h resides") -FIND_LIBRARY(GBM_LIBRARY - NAMES GBM gbm - PATHS - ~/lib/ - /usr/lib64 - /usr/lib - /usr/local/lib64 - /usr/local/lib - /sw/lib - /opt/local/lib - DOC "The GBM library") - -IF(GBM_INCLUDE_PATH) - INCLUDE_DIRECTORIES(${GBM_INCLUDE_PATH}) - SET(GBM_FOUND 1 CACHE STRING "Set to 1 if GBM is found, 0 otherwise") -ELSE(GBM_INCLUDE_PATH) - SET(GBM_FOUND 0 CACHE STRING "Set to 1 if GBM is found, 0 otherwise") -ENDIF(GBM_INCLUDE_PATH) - -MARK_AS_ADVANCED(GBM_FOUND) |