Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (32e1ea317c4e1934face4c7bf62837fe0c2a346a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (32e1ea317c4e1934face4c7bf62837fe0c2a346a)
  • Date: Sat, 4 Jan 2025 04:33:05 +0000

GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:

FUNCTIONS | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 32e1ea317c4e1934face4c7bf62837fe0c2a346a
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

FUNCTIONS: support alternative srcdir in cmake_build

Added parsing of a new parameter, -S SOURCE_DIRECTORY, to enable
building with a source directory located at a path other than ../, which
is the default if -S is not passed in.

diff --git a/FUNCTIONS b/FUNCTIONS
index 2da5ca1..d228363 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -698,7 +698,12 @@ function waf_install() {
}

# spells in several sections now need cmake or qt4
+# pass -S SOURCE_DIRECTORY to build in SOURCE_DIRECTORY instead of ../
cmake_build() {
+ local srcdir="../"
+ case "$1" in
+ -s) srcdir="$2"; shift 2 ;;
+ esac
mkdir -p builddir &&
cd builddir &&
prepare_cmake_flags &&
@@ -724,7 +729,7 @@ cmake_build() {
-DCMAKE_BUILD_TYPE=$CM_BUILD_TYPE \
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
- $OPTS ../ &&
+ $OPTS -S "$srcdir" &&
CMAKE_BUILD_PARALLEL_LEVEL=$((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST +
MAKE_NJOBS)) \
cmake --build .
}


  • [[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (32e1ea317c4e1934face4c7bf62837fe0c2a346a), Justin Boffemmyer, 01/03/2025

Archive powered by MHonArc 2.6.24.

Top of Page