sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a7a6fef5a7f952efdb1a61a58ae46b84a89828cf)

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 (a7a6fef5a7f952efdb1a61a58ae46b84a89828cf)
Date: Wed, 26 Jul 2023 07:33:37 +0000

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

devel/cmake/HISTORY | 3 +++
devel/cmake/PRE_BUILD | 4 ++++
2 files changed, 7 insertions(+)

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

cmake - fix build if qt6 present

diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index b4b2ff4..81ebff1 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,6 @@
+2023-07-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: bootstrap wrongly finds traces of qt6 and build then
fails
+
2023-07-25 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.27.1

diff --git a/devel/cmake/PRE_BUILD b/devel/cmake/PRE_BUILD
new file mode 100755
index 0000000..598057b
--- /dev/null
+++ b/devel/cmake/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# prevent misdetection of qt6 during bootstrap
+sed -i '/add_subdirectory(Tests)/D' CMakeLists.txt

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a7a6fef5a7f952efdb1a61a58ae46b84a89828cf), Treeve Jelbert, 07/26/2023