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:03:48 +0800 |
| commit | b03a78049701b5d54e30180ec6b129a364a349d7 (patch) | |
| tree | a24475c932b9042cbc8d3d60407f3512c15f7bdb /examples | |
| parent | 38cf31ff08d3b431c414f0ea7931881be958c671 (diff) | |
| download | beignet-b03a78049701b5d54e30180ec6b129a364a349d7.tar.gz | |
build: use EXECUTE_PROCESS to replace the deprecated EXEC_PROGRAM.
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>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 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 |