Changeset View
Changeset View
Standalone View
Standalone View
lang/beignet/files/patch-CMakeLists.txt
| --- CMakeLists.txt.orig 2017-01-20 10:44:56 UTC | --- CMakeLists.txt.orig 2017-07-31 05:05:22 UTC | ||||
| +++ CMakeLists.txt | +++ CMakeLists.txt | ||||
| @@ -31,7 +31,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA | @@ -31,7 +31,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA | ||||
| INCLUDE (FindPkgConfig) | INCLUDE (FindPkgConfig) | ||||
| -SET(CMAKE_VERBOSE_MAKEFILE "false") | -SET(CMAKE_VERBOSE_MAKEFILE "false") | ||||
| set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/") | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/") | ||||
| INCLUDE (GNUInstallDirs OPTIONAL) | INCLUDE (GNUInstallDirs OPTIONAL) | ||||
| # support old CMake without GNUInstallDirs | # support old CMake without GNUInstallDirs | ||||
| @@ -101,7 +100,7 @@ ELSE (USE_STANDALONE_GBE_COMPILER STREQU | @@ -101,7 +100,7 @@ ELSE (USE_STANDALONE_GBE_COMPILER STREQU | ||||
| ENDIF (USE_STANDALONE_GBE_COMPILER STREQUAL "true") | ENDIF (USE_STANDALONE_GBE_COMPILER STREQUAL "true") | ||||
| -set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic -Wl,--no-undefined ${LLVM_LDFLAGS}") | -set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic -Wl,--no-undefined ${LLVM_LDFLAGS}") | ||||
| +set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic ${LLVM_LDFLAGS}") | +set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic ${LLVM_LDFLAGS}") | ||||
| # XLib | # XLib | ||||
| Find_Package(X11) | Find_Package(X11) | ||||
| @@ -219,7 +218,7 @@ IF(OCLIcd_FOUND) | @@ -219,7 +218,7 @@ IF(OCLICD_COMPAT) | ||||
| "intel-beignet.icd.in" | |||||
| "${ICD_FILE_NAME}" | "${ICD_FILE_NAME}" | ||||
| ) | ) | ||||
| - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors) | IF(NOT OCL_ICD_INSTALL_PREFIX) | ||||
| + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors) | - set(OCL_ICD_INSTALL_PREFIX "/etc/OpenCL/vendors") | ||||
| + set(OCL_ICD_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors") | |||||
| ENDIF(NOT OCL_ICD_INSTALL_PREFIX) | |||||
| install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${OCL_ICD_INSTALL_PREFIX}) | |||||
| ELSE(OCLIcd_FOUND) | ELSE(OCLIcd_FOUND) | ||||
| MESSAGE(STATUS "Looking for OCL ICD header file - not found") | |||||
| ENDIF(OCLIcd_FOUND) | |||||