Ping for review, thanks.
Thanks Yejun -----Original Message----- From: Guo, Yejun Sent: Friday, June 06, 2014 3:00 PM To: [email protected] Subject: RE: [PATCH] relax the build dependency on Gen GPU Ping for review, thanks. Thanks Yejun -----Original Message----- From: Guo, Yejun Sent: Tuesday, May 27, 2014 6:13 AM To: [email protected] Cc: Guo, Yejun Subject: [PATCH] relax the build dependency on Gen GPU 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 <[email protected]> --- src/CMakeLists.txt | 8 +++++--- utests/CMakeLists.txt | 5 ----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 20e1a4c..2e65322 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 a731ab0..48f8de0 100644 --- a/utests/CMakeLists.txt +++ b/utests/CMakeLists.txt @@ -180,11 +180,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 -- 1.8.3.2 _______________________________________________ Beignet mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/beignet
