1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-07-03 07:05:26 +02:00
Commit graph

5 commits

Author SHA1 Message Date
Maxim Cournoyer
041b733cf4 cmake: Simplify lookup logic for libjami headers.
* extras/build/cmake/modules/FindLibJami.cmake: Rename
LIBJAMI_INCLUDE_DIRS to LIBJAMI_INCLUDE_DIR.  Use find_path to search
for jami.h directory.
* CMakeLists.txt: Adjust accordingly.
* src/libclient/CMakeLists.txt: Likewise.
* src/libclient/qtwrapper/CMakeLists.txt: Likewise.

Change-Id: I494358f9bfafb41f000daeec4196747b2c184401
2022-12-28 10:14:18 -05:00
Sébastien Blin
3349b7deff packaging: migrate packaging scripts in client-qt
This patch moves already existing packaging scripts from jami-project
into client-qt.
Introduced changes are:
+ WITH_SUBMODULE must search in system lib too because for
packaging client-qt (for rpm) will be built separately, and will
depend on jami-daemon.
+ Fix appdata.xml (replace old wiki with docs.jami.net)
+ path changes (because we build in client-qt not jami-project).

GitLab: #853
Change-Id: I1313830d85c8094fcbcc52e22033a2add7b1e89f
2022-12-20 11:17:00 -05:00
Amin Bandali
ca7b1e70e4 build: Add daemon submodule and optionally use it.
This allows invoking cmake with -DWITH_DAEMON_SUBMODULE=true to use
the daemon header files and library from the submodule.  Note that it
is currently still necessary to build the daemon separately first,
either manually or using the build.py convenience script.

The goal is to eventually add support for building the daemon with
CMake in the future, so that we could add_subdirectory(${DAEMON_DIR})
in client-qt's CMakeLists.txt and have CMake take care of everything.

Change-Id: I3a16c44837e6c79616b3101fea8a6ff3defa3ab5
2022-10-17 16:20:47 -04:00
Amin Bandali
3f1bc76c08 build: Simplify FindLibJami.cmake module.
* extras/build/cmake/modules/FindLibJami.cmake: find_library's NAMES
option can take multiple library names.  So, just use that instead of
multiple almost-duplicate calls to find_library for trying different
names.

Change-Id: I9ae5d96e1abcb8117ad65b79b3cc27424b4f87d7
2022-10-17 16:02:27 -04:00
Amin Bandali
2fc8661d08 misc: Clean up repository root.
This is the first in a series for cleaning up the top directory (root)
of the repository and move various files/folders into nicely organized
directory structures.

GitLab: #749
Change-Id: If59b74fff981df242bc26e62a070bdb81d7baded
2022-10-07 17:30:06 -04:00