Age | Commit message (Collapse) | Author | Files | Lines |
|
gunixconnection.h is now at /usr/include/glib-2.0/gio/gunixconnection.h
|
|
On traditional systems, both DBUS_GLIB_INCLUDE_DIR and DBUS_INCLUDE_DIR
point to something like /usr/include/dbus-1.0. This does need to be the
case though – for example, Nix installs each library to a separate directory
in the Nix store.
Additionally, since CMake uses its own hacky scripts instead of actually
obtaining the correct flags from pkgconfig, the DBUS_GLIB_INCLUDE_DIR
did not contain the dbus-1.0 path.
This patch fixes the DBUS_GLIB_INCLUDE_DIR variable and then adds it
to include_directories for Farstream.
|
|
|
|
LIB_INSTALL_DIR and INCLUDE_INSTALL_DIR are now always absolute paths.
|
|
The documentation says that PATHS has lower priority than the standard
system environment variables.
Use HINTS to lookup the directories from pkg-config at first.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40008
|
|
|
|
|
|
As the CMake MATCH takes regex parameter, sub-string could unexpectedtly
be matched. QT verseion 5.12.4, for instance, will be matched with not just
for QT5 but also for QT4 as well due to the sub-string '4' which is unexpected.
This patch resolves the issue by constraining version number testing for
Major version numbers only.
Signed-off-by: Brandon Hong <brandon.hong@intel.com>
|
|
|
|
Use the upstream one (available for ages)
|
|
|
|
|
|
less things to maintain... FeatureSummary is part of cmake
|
|
We do not install anything in that directory. But having it causes an error
for any user of telepathy-qt when the directory does not exist.
|
|
...and therefore remove the bundled MacroWriteBasicCMakeVersionFile
This gives the advantages that configure_package_config_file() gives
and also removes the need for us to maintain one more macro.
|
|
|
|
endif(), endmacro(), endfunction()
This is an old cmake syntax that is not required anymore.
It's ugly and makes code hard to read.
|
|
This was probably needed because the pkgconfig check for QtCore
was failing, so the code in CMakeLists.txt that adds -fPIC and -fPIE
in the flags was never executed.
Currently, -fPIC and -fPIE are added when 'reduce_relocations' is present
in the qt_config flags in Qt5Core.pc
Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com>
|
|
Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com>
|
|
Generated header now depends on input xmls.
Fixes build with ninja.
|
|
This ensures that Python 2 is found if possible, rather than Python 3.
https://bugs.freedesktop.org/show_bug.cgi?id=91659
Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com>
|
|
Since GStreamer-1.5.1 config header file moved to LIBDIR.
Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com>
|
|
Since glibc-2.20 _DEFAULT_SOURCE definition is also required.
Reviewed-by: Alexandr Akulich
|
|
Unused typedefs can happen easily with varying versions of TpGlib, and
it's not a problem that should cause compliation to fail.
|
|
Reviewed-by: David Edmundson
|
|
|
|
If Qt5 is found via cmake we do not need to find the qmake
executable. This fixes builds when only qmake4 is available in the path.
Reviewed-by: David Edmundson
|
|
Make further use of Qt 5's cmake integration
Reviewed-by: David Edmundson
|
|
The check was already there, but since Qt5 CMake files are being shipped with
Qt5 itself, the check was meaningless as the only thing which matters is
Qt's version, and not CMake's one.
Reviewed-by: David Edmundson <davidedmundson@kde.org>
|
|
Reviewed-by: John Brooks <john.brooks@jolla.com>
|
|
Recent cmake has changed the argument count to
qt4_create_moc_command, we need to adjust accordingly
Reviewed-by: Dario Freddi <dario.freddi@ispirata.com>
|
|
|
|
|
|
|
|
This flag allows most inline functions to be hidden from the exported
symbol table to avoid symbol table pollution.
|
|
|
|
|
|
Qt 5 alpha release has some build issues that should be addressed in order to build tp-qt against
it:
- When running configure in Qt 5 alpha, the pkgconfig files are properly generated, but when make is
executed, the files are replaced with empty ones, so to build tp-qt one must either backup the pkgconfig
files generated during the configure phase before running make and replace them afterwards,
or re-run configure with the same parameters after building it. (reported and should be fixed when
beta is out)
- If Qt 5 alpha is built with -reduce-relocations enabled, one must add the keyword
"reduce_relocations" to qtbase/lib/pkgconfig/QtCore.pc in the qt_config section, so that tp-qt knows
when to use -fPIC/PIE accordingly. (reported and should be fixed when beta is out)
|
|
To be more consitent with how client side is implemented, the service side high-level
classes are now moved to the TelepathyQt dir, removing the separate Service dir.
Library specific globals (TP_QT_EXPORT, etc) are now shared between tp-qt-service and tp-qt.
The plan is to merge both libraries into tp-qt in the future, when the service side bindings
are API/ABI stable.
|
|
|
|
telepathy_qt_SRCS.
|
|
into the build system.
|
|
Reviewed-by: Olli Salli (oggis) <olli.salli@collabora.co.uk>
|
|
DBUS_GLIB_LOWLEVEL_INCLUDE_DIR into DBUS_GLIB_INCLUDE_DIRS.
|
|
<dbus/dbus-glib-lowlevel.h>.
|
|
dbus-glib.
|
|
installation of config files
|
|
This is to avoid having TelepathyQt4.pc pick Qt5 instead of Qt4.
|
|
Qt being used.
|
|
|