diff options
| author | Guo Yejun <yejun.guo@intel.com> | 2014-05-27 06:13:12 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@intel.com> | 2014-06-12 17:33:45 +0800 |
| commit | e574237d9c734dcab56349e651de9f3fe6ec2500 (patch) | |
| tree | 1ad1331e12b381193e290ff03609008e33904765 | |
| parent | 47874592adac08862cfefd5c7915b926cc37a900 (diff) | |
relax the build dependency on Gen GPUopencl-1.1
currently, the Gen GPU pciid of the underlying system is queried
and then passed to gbe_bin_generater as the target option.
This does not work when building the driver on another system with
non-intel GPUs, this patch relaxes the dependency by exporting the
pciid setting at CMake level, therefore, the pciid could be given
as a CMake option besides the current real time query method.
this patch also remove the redundancy code in utest/CMake by setting
PARENT_SCOPE in src/CMake.
Signed-off-by: Guo Yejun <yejun.guo@intel.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | utests/CMakeLists.txt | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index af782785..7d0ce0a7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,10 +5,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../include ${MESA_SOURCE_INCLUDES}) -set(GEN_PCI_ID) -execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/GetGenID.sh" +if (NOT GEN_PCI_ID) + execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/GetGenID.sh" OUTPUT_VARIABLE GEN_PCI_ID) -message(STATUS "Platform Gen PCI id is " ${GEN_PCI_ID}) + message(STATUS "Platform Gen PCI id is " ${GEN_PCI_ID}) + set(GEN_PCI_ID ${GEN_PCI_ID} PARENT_SCOPE) +endif (NOT GEN_PCI_ID) macro (MakeKernelBinStr KERNEL_PATH KERNEL_FILES) foreach (KF ${KERNEL_FILES}) diff --git a/utests/CMakeLists.txt b/utests/CMakeLists.txt index 76bc56e1..d950e5d6 100644 --- a/utests/CMakeLists.txt +++ b/utests/CMakeLists.txt @@ -178,11 +178,6 @@ set (utests_sources utest_file_map.cpp utest_helper.cpp) -set(GEN_PCI_ID) -execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/../src/GetGenID.sh" - OUTPUT_VARIABLE GEN_PCI_ID) - -message(STATUS "Platform Gen PCI id is " ${GEN_PCI_ID}) SET (kernel_bin ${CMAKE_CURRENT_SOURCE_DIR}/../kernels/compiler_ceil) ADD_CUSTOM_COMMAND( OUTPUT ${kernel_bin}.bin |