Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a7c65807d897e99802049430c51810033f75231c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a7c65807d897e99802049430c51810033f75231c)
  • Date: Thu, 25 Sep 2014 21:40:55 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

FUNCTIONS | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit a7c65807d897e99802049430c51810033f75231c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: cmake_build: Pass down CFLAGS and CXXFLAGS

commit d39b3474611bd74b4fc3620dbee6fa23d9df3a85
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: cmake_build: Allow spaces in INSTALL_ROOT and SOURCE_DIRECTORY

diff --git a/FUNCTIONS b/FUNCTIONS
index 4ca4510..55bef4f 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -535,16 +535,18 @@ function waf_install() {

# spells in several sections now need cmake or qt4
cmake_build() {
- cd $SOURCE_DIRECTORY &&
+ cd "$SOURCE_DIRECTORY" &&
mkdir -p build &&
cd build &&
prepare_cmake_flags &&
- cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr \
+ cmake -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT"/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_MANDIR=share/man \
-DCMAKE_PREFIX_PATH=share/apps/cmake/modules \
- -DSYSCONFDIR=$INSTALL_ROOT/etc \
+ -DSYSCONFDIR="$INSTALL_ROOT"/etc \
-DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
$OPTS ../ &&
make
}



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (a7c65807d897e99802049430c51810033f75231c), Ismael Luceno, 09/25/2014

Archive powered by MHonArc 2.6.24.

Top of Page