Skip to Content.
Sympa Menu

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

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 (0868ad05186000a996426e1f48af5596a8e16666)
  • Date: Wed, 28 Jun 2023 11:41:55 +0000

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

CMAKE_CONFIGURE | 1 +
ChangeLog | 4 ++++
FUNCTIONS | 1 +
KDE_FUNCTIONS | 1 -
4 files changed, 6 insertions(+), 1 deletion(-)

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

KDE_FUNCTIONS - tweak

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

cmake unity support

diff --git a/CMAKE_CONFIGURE b/CMAKE_CONFIGURE
index f03d7d4..f65fbd3 100755
--- a/CMAKE_CONFIGURE
+++ b/CMAKE_CONFIGURE
@@ -3,3 +3,4 @@ config_query_list CM_BUILD_TYPE 'which build type?' Release
Debug RelWithDebIn
config_query_option CM_TESTS 'build tests?' n "-DBUILD_TESTING=1"
"-DBUILD_TESTING=0"
#fi
persistent_remove CMAKE_GEN
+config_query_option CM_UNITY "support Unity build" y
-DCMAKE_UNITY_BUILD={true,false}
diff --git a/ChangeLog b/ChangeLog
index 3230295..473dce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2023-06-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS CMAKE_CONFIGURE: support cmake unity build
+ * KDE_FUNCTIONS: tweak build options
+
2023-06-22 Treeve Jelbert <treeve AT sourcemage.org>
* ktp/*: deleted, dead upstream, suggest neochat or konversation
instead

diff --git a/FUNCTIONS b/FUNCTIONS
index 849b383..9307336 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -698,6 +698,7 @@ cmake_build() {
-DCMAKE_BUILD_TYPE=$CM_BUILD_TYPE \
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+ $CM_UNITY \
$OPTS ../ &&
cmake --build .
}
diff --git a/KDE_FUNCTIONS b/KDE_FUNCTIONS
index 2f0b310..73e2b90 100755
--- a/KDE_FUNCTIONS
+++ b/KDE_FUNCTIONS
@@ -8,7 +8,6 @@ default_build() {
OPTS+=" -DCMAKE_PREFIX_PATH=/opt/qt6"
OPTS+=" -DBUILD_WITH_QT6=ON"
OPTS+=" -DUSE_QT6=ON"
- OPTS+=" -DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.91.0"
OPTS+=" -DQT_MAJOR_VERSION=6"
fi
cmake_build



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0868ad05186000a996426e1f48af5596a8e16666), Treeve Jelbert, 06/28/2023

Archive powered by MHonArc 2.6.24.

Top of Page