diff --git a/thirdparty/Catch2/HPKBUILD b/thirdparty/Catch2/HPKBUILD index ac6d7f559b149b5e8343cf336850e3b1036b7929..d6b30b3f40ed4ddb252ba9eaae2d35a0190c6ac3 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 }