diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-09-20 08:00:03 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-09-20 08:00:03 +0000 |
| commit | 07cf711295242911da9d722d41ebb29188c6fa9c (patch) | |
| tree | c026c82c3ce8670fd271ff4274799c2632d17dcf | |
| parent | 6846e3f17d9918fb0fed1eea5d2496d37991091d (diff) | |
| download | qxmpp-07cf711295242911da9d722d41ebb29188c6fa9c.tar.gz | |
make sure examples/tests get rebuilt when QXmpp library changes (only done for unix systems for now)
| -rw-r--r-- | examples/examples.pri | 5 | ||||
| -rw-r--r-- | qxmpp.pri | 7 | ||||
| -rw-r--r-- | tests/tests.pro | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/examples/examples.pri b/examples/examples.pri index 52d44b5c..3675676c 100644 --- a/examples/examples.pri +++ b/examples/examples.pri @@ -8,10 +8,7 @@ CONFIG += console INCLUDEPATH += $$QXMPP_INCLUDE_DIR LIBS += $$QXMPP_LIBS - -# FIXME: we need to express a dependency on the library, but the file name -# depends on the platform and whether the library is static or dynamic -# PRE_TARGETDEPS += $${QXMPP_LIBRARY_DIR}/lib$${QXMPP_LIB}.a +PRE_TARGETDEPS += $$QXMPP_LIBRARY_FILE # Symbian packaging rules symbian { @@ -30,3 +30,10 @@ symbian { # in the extra libraries which the qxmpp library needs, but this does not # seem to work on win32, so we specify the dependencies here: QXMPP_LIBS += $$QXMPP_INTERNAL_LIBS + +# Path of the QXmpp library file, for expressing dependency. +symbian { +} else:unix { + QXMPP_LIBRARY_FILE = $${QXMPP_LIBRARY_DIR}/lib$${QXMPP_LIBRARY_NAME}.a +} + diff --git a/tests/tests.pro b/tests/tests.pro index c36c28c6..43a952e2 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -10,3 +10,4 @@ HEADERS += tests.h INCLUDEPATH += $$QXMPP_INCLUDE_DIR LIBS += $$QXMPP_LIBS +PRE_TARGETDEPS += $$QXMPP_LIBRARY_FILE |