From ab3d7a77acb9d8b891e43b7e57c22d1e59bb280b Mon Sep 17 00:00:00 2001 From: liuhuayi <9170014+tsukione@user.noreply.gitee.com> Date: Thu, 9 Dec 2021 14:58:38 +0000 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96=E8=BD=AF?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E7=BC=96=E8=AF=91=E5=91=BD=E4=BB=A4=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99if=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chart_plugin/doc/mathgl_compile.md | 14 ++------------ chart_plugin/doc/qwt_compile.md | 10 +++------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/chart_plugin/doc/mathgl_compile.md b/chart_plugin/doc/mathgl_compile.md index 9fca66c..7bfbfe4 100644 --- a/chart_plugin/doc/mathgl_compile.md +++ b/chart_plugin/doc/mathgl_compile.md @@ -8,18 +8,8 @@ cd mathgl-2.4.4 mkdir -p build && cd build echo "CMAKE_PREFIX_PATH = $1, CMAKE_INCLUDE_PATH=$2" (参数1为QT5的cmake搜索路径,参数2为GL/gl.h文件路径,如果没有参数采用系统默认路径搜索) - if [[ -n "$1" && -n "$2" ]] - then - cmake -D enable-png=OFF -D enable-opengl=OFF\ - -D enable-openmp=OFF -D enable-pthread=ON -D enable-qt5=ON\ - -DCMAKE_CXX_FLAGS=-fno-sized-deallocation\ - -DCMAKE_INSTALL_PREFIX=.\ - -DCMAKE_PREFIX_PATH=$1\ - -DCMAKE_INCLUDE_PATH=$2 .. - else - cmake -D enable-png=OFF -D enable-opengl=OFF -D enable-openmp=OFF\ - -D enable-pthread=ON -D enable-qt5=ON -DCMAKE_INSTALL_PREFIX=. .. - fi + + cmake -D enable-png=OFF -D enable-opengl=OFF -D enable-openmp=OFF -D enable-pthread=ON -D enable-qt5=ON -DCMAKE_INSTALL_PREFIX=. .. ``` 3. 编译与安装。 ``` diff --git a/chart_plugin/doc/qwt_compile.md b/chart_plugin/doc/qwt_compile.md index 1de6486..d3331a4 100644 --- a/chart_plugin/doc/qwt_compile.md +++ b/chart_plugin/doc/qwt_compile.md @@ -9,13 +9,9 @@ sed -i 's/^\(.*QwtOpenGL\)/# \1/' qwtconfig.pri INSTALL_PATH=`pwd` sed -i "s|^ *QWT_INSTALL_PREFIX.*$|QWT_INSTALL_PREFIX = $INSTALL_PATH/build|g" qwtconfig.pri - if [ -n "$1" ] - then - sed -i '/-std=c++11/ s/#//' qwtbuild.pri - $1 qwt.pro - else - /usr/lib/qt5/bin/qmake qwt.pro(本地环境的qmake路径) - fi + + # 请替换为本地环境的qmake路径 + /usr/lib/qt5/bin/qmake qwt.pro ``` 3. 编译与安装。 ``` -- Gitee