Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8a566c49ce1d1bf0ce0d41f1f94a70d21af3183b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8a566c49ce1d1bf0ce0d41f1f94a70d21af3183b)
  • Date: Sat, 19 Dec 2020 12:02:07 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

devel/cppcheck/BUILD | 6 +-----
devel/cppcheck/DEPENDS | 14 ++++++++------
devel/cppcheck/HISTORY | 4 ++++
libs/tinyxml/CONFIGURE | 1 -
libs/tinyxml/DETAILS | 4 ++--
libs/tinyxml/HISTORY | 4 ++++
6 files changed, 19 insertions(+), 14 deletions(-)

New commits:
commit 8a566c49ce1d1bf0ce0d41f1f94a70d21af3183b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cppcheck - tweak

commit 8259c95b51ee12a87c9eb79948c3ff5d2895e5fd
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

tinyxml: => 8.0.0

diff --git a/devel/cppcheck/BUILD b/devel/cppcheck/BUILD
index b29f8c7..f322593 100755
--- a/devel/cppcheck/BUILD
+++ b/devel/cppcheck/BUILD
@@ -1,6 +1,2 @@
OPTS="-DHAVE_RULES=true $OPTS" &&
-if is_depends_enabled $SPELL qtbase; then
- qt5_cmake_build
-else
- cmake_build
-fi
+cmake_build
diff --git a/devel/cppcheck/DEPENDS b/devel/cppcheck/DEPENDS
index a1620a1..e07cf77 100755
--- a/devel/cppcheck/DEPENDS
+++ b/devel/cppcheck/DEPENDS
@@ -1,8 +1,10 @@
source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-depends z3 &&
-
-optional_depends qtbase \
- "-DBUILD_GUI=true" \
- "-DBUILD_GUI=false" \
- "build Qt GUI?"
+depends libxml2 &&
+depends pcre &&
+optional_depends z3 '-DUSE_Z3' '' '' &&
+optional_depends qtbase -DBUILD_GUI={true,false} "build Qt GUI?" &&
+if is_depends_enabled $SPELL qtbase;then
+ optional_depends qtcharts '' '' 'chart support'
+fi &&
+optional_depends tinyxml -DUSE_BUNDLED_TINYXML2={false,true} 'use system
tinyxml'
diff --git a/devel/cppcheck/HISTORY b/devel/cppcheck/HISTORY
index ee601a6..7861083 100644
--- a/devel/cppcheck/HISTORY
+++ b/devel/cppcheck/HISTORY
@@ -1,3 +1,7 @@
+2020-12-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: simplify
+ * DEPENDS: z3 optional, add pcre, tinyxml, qtcharts
+
2020-12-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.3

diff --git a/libs/tinyxml/CONFIGURE b/libs/tinyxml/CONFIGURE
index fd5acc6..b2f02c3 100755
--- a/libs/tinyxml/CONFIGURE
+++ b/libs/tinyxml/CONFIGURE
@@ -1,2 +1 @@
source $GRIMOIRE/CMAKE_CONFIGURE
-config_query TINYXML_STL "Build with STL support?" "n"
diff --git a/libs/tinyxml/DETAILS b/libs/tinyxml/DETAILS
index 41299af..1e043bb 100755
--- a/libs/tinyxml/DETAILS
+++ b/libs/tinyxml/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=tinyxml
- VERSION=7.0.1
-
SOURCE_HASH=sha512:623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380
+ VERSION=8.0.0
+
SOURCE_HASH=sha512:bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}2-$VERSION"
WEB_SITE=https://github.com/leethomason/tinyxml2
diff --git a/libs/tinyxml/HISTORY b/libs/tinyxml/HISTORY
index 766a6d3..2478301 100644
--- a/libs/tinyxml/HISTORY
+++ b/libs/tinyxml/HISTORY
@@ -1,3 +1,7 @@
+2020-12-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 8.0.0
+ * CONFIGURE: remove obsolete option
+
2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8a566c49ce1d1bf0ce0d41f1f94a70d21af3183b), Treeve Jelbert, 12/19/2020

Archive powered by MHonArc 2.6.24.

Top of Page