---
ChangeLog | 4 ++++
build-aux/build_unit_test.sh | 10 +++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index ba84a7b..154b20b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-11 Roland Levillain <roland(a)lrde.epita.fr>
+
+ * build-aux/build_unit_test.sh: Properly handle QT_LIBS.
+
2013-09-09 Roland Levillain <roland(a)lrde.epita.fr>
Olena: Remove Milena's build dir from the file inclusion path.
diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh
index 6623c01..7f4748f 100755
--- a/build-aux/build_unit_test.sh
+++ b/build-aux/build_unit_test.sh
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory
+# Copyright (C) 2009, 2010, 2013 EPITA Research and Development Laboratory
# (LRDE)
#
# This file is part of Olena.
@@ -120,6 +120,14 @@ EOF
done
echo "$cppflags \${AM_CPPFLAGS}" >>"$output"
echo "$ldflags \${AM_LDFLAGS}" >>"$output"
+
+ # Local hack: Handle the special case of Qt, which defines
+ # QT_LIBS, to be use for with ${NAME}_LDADD variables.
+ for i in $IFDEF; do
+ if test "x$i" = xQT; then
+ echo "${NAME}_LDADD= \${QT_LIBS} \${LDADD}" >>"$output"
+ fi
+ done
fi
done
--
1.7.10.4
Show replies by date