Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (1164490d43e2a5a613583f02ba0418b873df5386)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (1164490d43e2a5a613583f02ba0418b873df5386)
  • Date: Fri, 5 Jan 2018 11:32:34 +0000

GIT changes to master games grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 3 +++
FUNCTIONS | 12 +++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 1164490d43e2a5a613583f02ba0418b873df5386
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

FUNCTIONS: port changes to qt*_cmake_build from test

diff --git a/ChangeLog b/ChangeLog
index dc91975..80530d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-12-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * FUNCTIONS: port changes to qt*_cmake_build from test grimoire
+
2017-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* FUNCTIONS: add qt5_cmake_build

diff --git a/FUNCTIONS b/FUNCTIONS
index 36d156c..1a4fc7d 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -1,6 +1,9 @@
. $GRIMOIRE/libaccount
. $GRIMOIRE/libgcc

+QT4DIR=$INSTALL_ROOT/opt/qt4
+QT5DIR=$INSTALL_ROOT/opt/qt5
+
#---------------------------------------------------------------------
## Replaces sorcerys default_pre_build with a custom version using
## the invoke_gcc function from libgcc
@@ -93,9 +96,9 @@ function cmake_build() {
#---
#
qt4_cmake_build() {
- QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
- PATH="$QTDIR/bin/qt4:$PATH"
- cmake_build
+ PATH="$QT4DIR/bin/:$PATH"
+ export PKG_CONFIG_PATH="$QT4DIR/lib/pkgconfig"
+ cmake_build ${1-$QT4DIR}
}

#---
@@ -350,8 +353,7 @@ function get_scm_version() {
function qt5_cmake_build() {
PATH="$QT5DIR/bin/:$PATH"
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
- cmake_build $QT5DIR
+ cmake_build ${1-$QT5DIR}
}

-
. $GRIMOIRE/glselect.function



  • [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (1164490d43e2a5a613583f02ba0418b873df5386), Florian Franzmann, 01/05/2018

Archive powered by MHonArc 2.6.24.

Top of Page