diff options
| author | Junyan He <junyan.he@linux.intel.com> | 2014-09-15 16:04:10 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@intel.com> | 2014-09-15 17:13:16 +0800 |
| commit | a191cbbd17bdc548adb11fc943caf48f256044ef (patch) | |
| tree | 35af854852b707ffdd11795cdf3a44229e465895 | |
| parent | e6fb1600616e02fd5d27813d2e569b55809d6eba (diff) | |
Modify the CMakeList to use the internal PCH first.
Because we delete the validation of the PCH file, sometimes
the PCH in the system dir is not compatible with the clang
and cause crash.
Anytime, we need to use internal PCH when compiling.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
| -rw-r--r-- | backend/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | backend/src/CMakeLists.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index 64f1bb05..b02e17f0 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -44,6 +44,6 @@ set(LOCAL_GBE_OBJECT_DIR ${LOCAL_GBE_OBJECT_DIR} PARENT_SCOPE) set(LOCAL_INTERP_OBJECT_DIR ${LOCAL_INTERP_OBJECT_DIR} PARENT_SCOPE) set (GBE_BIN_GENERATER - OCL_BITCODE_BIN=${LOCAL_OCL_BITCODE_BIN} OCL_HEADER_DIR=${LOCAL_OCL_HEADER_DIR} OCL_PCH_OBJECT=${LOCAL_OCL_PCH_OBJECT} LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src/gbe_bin_generater + OCL_BITCODE_LIB_PATH=${LOCAL_OCL_BITCODE_BIN} OCL_HEADER_FILE_DIR=${LOCAL_OCL_HEADER_DIR} OCL_PCH_PATH=${LOCAL_OCL_PCH_OBJECT} LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src/gbe_bin_generater PARENT_SCOPE) diff --git a/backend/src/CMakeLists.txt b/backend/src/CMakeLists.txt index 1df87324..e57227a2 100644 --- a/backend/src/CMakeLists.txt +++ b/backend/src/CMakeLists.txt @@ -1,6 +1,6 @@ -set (OCL_BITCODE_BIN "${BEIGNET_INSTALL_DIR}beignet.bc:${CMAKE_CURRENT_BINARY_DIR}/libocl/lib/beignet.bc") -set (OCL_HEADER_DIR "${CMAKE_INSTALL_PREFIX}/include/CL/ocl/:${CMAKE_CURRENT_BINARY_DIR}/libocl/include/") -set (OCL_PCH_OBJECT "${BEIGNET_INSTALL_DIR}beignet.pch:${CMAKE_CURRENT_BINARY_DIR}/libocl/lib/beignet.pch") +set (OCL_BITCODE_BIN "${BEIGNET_INSTALL_DIR}beignet.bc") +set (OCL_HEADER_DIR "${CMAKE_INSTALL_PREFIX}/include/CL/ocl/") +set (OCL_PCH_OBJECT "${BEIGNET_INSTALL_DIR}beignet.pch") set (GBE_OBJECT_DIR "${BEIGNET_INSTALL_DIR}/libgbe.so") set (INTERP_OBJECT_DIR "${BEIGNET_INSTALL_DIR}/libgbeinterp.so") |