diff options
| author | Zhigang Gong <zhigang.gong@intel.com> | 2015-05-19 13:40:35 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@intel.com> | 2015-05-26 13:04:50 +0800 |
| commit | c905149043a826fa3bf74a3af5301a6d00740de9 (patch) | |
| tree | 14e2fb0276c822271ac3af79e0ff870c2d7d5480 | |
| parent | a6810c54b5bfa4c88d9fec6fb1f86fdea4af75af (diff) | |
| download | beignet-Release_v1.0.tar.gz | |
build: use EXECUTE_PROCESS to replace the deprecated EXEC_PROGRAM.Release_v1.0
I found EXEC_PROMGRAM may truncate the output variable for some case
thus we may get incorrect generated unit test cases thus break the
configuration some times.
This patch use EXECUTE_PROCESS to replace all the deprecated EXEC_PROGRAM
and it will not truncate the output variable of the command.
v2:
fix the error in examples/CMakeLists.txt.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
Tested-by: "Meng, Mengmeng" <mengmeng.meng@intel.com>
| -rw-r--r-- | examples/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | utests/CMakeLists.txt | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 904f2593..2c13eac0 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,9 +1,9 @@ -EXEC_PROGRAM(ls ARGS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libva" OUTPUT_VARIABLE LS_OUTPUT) -IF(NOT LS_OUTPUT) -EXEC_PROGRAM(git "${CMAKE_CURRENT_SOURCE_DIR}/.." ARGS "submodule init") -EXEC_PROGRAM(git "${CMAKE_CURRENT_SOURCE_DIR}/.." ARGS "submodule update") -EXEC_PROGRAM(git "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libva" ARGS "checkout master") -ENDIF(NOT LS_OUTPUT) +EXECUTE_PROCESS(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libva" RESULT_VARIABLE LS_RESULT) +IF (NOT ("LS_RESULT" STREQUAL "0")) +EXECUTE_PROCESS(COMMAND git submodule init WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..) +EXECUTE_PROCESS(COMMAND git submodule update WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..) +EXECUTE_PROCESS(COMMAND git checkout master WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libva) +ENDIF (NOT ("LS_RESULT" STREQUAL "0")) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../utests diff --git a/utests/CMakeLists.txt b/utests/CMakeLists.txt index 9cbf260a..177d4855 100644 --- a/utests/CMakeLists.txt +++ b/utests/CMakeLists.txt @@ -2,8 +2,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../include) ##### Math Function Part: -EXEC_PROGRAM(mkdir ${CMAKE_CURRENT_SOURCE_DIR} ARGS generated -p) -EXEC_PROGRAM(${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} ARGS utest_math_gen.py OUTPUT_VARIABLE GEN_MATH_STRING) +EXECUTE_PROCESS(COMMAND mkdir generated -p WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} utest_math_gen.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE GEN_MATH_STRING) string(REGEX REPLACE " " ";" ADDMATHFUNC ${GEN_MATH_STRING}) string(REGEX REPLACE "generated/([^\ ]*)\\.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../kernels/\\1.cl" KERNEL_MATH_LIST ${GEN_MATH_STRING}) |