diff --git a/CM_linux_packages.cmake b/CM_linux_packages.cmake index a073edfa..f047f048 100644 --- a/CM_linux_packages.cmake +++ b/CM_linux_packages.cmake @@ -1,9 +1,8 @@ # determine the version number from the #define in libyuv/version.h -EXECUTE_PROCESS ( - COMMAND grep --perl-regex --only-matching "(?<=LIBYUV_VERSION )[0-9]+" include/libyuv/version.h - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - OUTPUT_VARIABLE YUV_VERSION_NUMBER - OUTPUT_STRIP_TRAILING_WHITESPACE ) +FILE(STRINGS "${PROJECT_SOURCE_DIR}/include/libyuv/version.h" YUV_VERSION_LINE + REGEX "^#define LIBYUV_VERSION [0-9]+$") +STRING(REGEX REPLACE "^#define LIBYUV_VERSION ([0-9]+)$" "\\1" + YUV_VERSION_NUMBER "${YUV_VERSION_LINE}") SET ( YUV_VER_MAJOR 0 ) SET ( YUV_VER_MINOR 0 ) SET ( YUV_VER_PATCH ${YUV_VERSION_NUMBER} ) @@ -66,4 +65,3 @@ SET ( CPACK_GENERATOR "DEB;RPM" ) # create the .deb and .rpm files (you'll need build-essential and rpm tools) INCLUDE( CPack ) - diff --git a/source/test.sh b/source/test.sh index 7f12c3c1..95fcce3f 100755 --- a/source/test.sh +++ b/source/test.sh @@ -1,7 +1,7 @@ -#!/bin/bash +#!/bin/sh set -x -function runbenchmark1 { +runbenchmark1() { perf record /google/src/cloud/fbarchard/clean/google3/blaze-bin/third_party/libyuv/libyuv_test --gunit_filter=*$1 --libyuv_width=1280 --libyuv_height=720 --libyuv_repeat=1000 --libyuv_flags=-1 --libyuv_cpu_info=-1 perf report | grep AVX }