From aade41f815b0f8600f72aaa4a850b9d585c80686 Mon Sep 17 00:00:00 2001 From: lxh Date: Mon, 4 Nov 2024 18:09:10 +0800 Subject: [PATCH] =?UTF-8?q?Catch2=E5=BA=93=E7=9A=84hpkbuild=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lxh --- thirdparty/Catch2/HPKBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/thirdparty/Catch2/HPKBUILD b/thirdparty/Catch2/HPKBUILD index ac6d7f55..d6b30b3f 100644 --- a/thirdparty/Catch2/HPKBUILD +++ b/thirdparty/Catch2/HPKBUILD @@ -39,8 +39,9 @@ prepare() { build() { cd $builddir - ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" -DOHOS_ARCH=$ARCH -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_BUILD_TESTING=ON \ - -DCMAKE_CXX_FLAGS="-Wno-unused-command-line-argument" -B$ARCH-build -S./ -L > $buildlog 2>&1 + PKG_CONFIG_LIBDIR="${pkgconfigpath}" ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" \ + -DOHOS_ARCH=$ARCH -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_BUILD_TESTING=ON \ + -DCMAKE_CXX_FLAGS="-Wno-unused-command-line-argument" -B$ARCH-build -S./ -L > $buildlog 2>&1 $MAKE VERBOSE=1 -C $ARCH-build >> $buildlog 2>&1 ret=$? cd $OLDPWD @@ -50,7 +51,7 @@ build() { # 打包安装 package() { cd $builddir - make -C $ARCH-build install >> $buildlog 2>&1 + $MAKE VERBOSE=1 -C $ARCH-build install >> $buildlog 2>&1 cd $OLDPWD } -- Gitee