From 1b678406e73e75d9728b03bb284757b293610fa5 Mon Sep 17 00:00:00 2001 From: yangwei Date: Fri, 28 Jul 2023 23:22:51 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20build(cmake=20version):=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=80=E4=BD=8E=E7=89=88=E6=9C=AC=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E8=87=B33.10=EF=BC=8C=E4=BF=AE=E5=A4=8Dchangelog?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E7=94=9F=E6=88=90=E5=8F=AF=E8=83=BD=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- cmake/changelog.sh | 2 +- test/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 374ba8b..50937bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8...3.10) set(lib_name quic) diff --git a/cmake/changelog.sh b/cmake/changelog.sh index 67f995f..087129d 100644 --- a/cmake/changelog.sh +++ b/cmake/changelog.sh @@ -1,4 +1,4 @@ #!/bin/sh work_path=$1 -branch=`git status | grep branch | awk '{print $NF}'` +branch=`git status | grep 'On branch' | awk '{print $NF}'` git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %ad %an %ae %nhash: %H%ncommit:%n%B" | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/ -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > $work_path/changelog.txt diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a264398..fe765b6 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8...3.10) set(lib_name quic) project(${lib_name}_test)