From 2d461cc5575d6e8b8d9b7c9dcfa59512ec672d4b Mon Sep 17 00:00:00 2001
From: ababi <albert.babi@savoirfairelinux.com>
Date: Tue, 15 Dec 2020 20:30:07 +0100
Subject: [PATCH] build: add support for custom lrc installation path
- qmake: add custom lrc path support
- cmake: add custom lrc path support, check qt version, update dependencies, optional test compilation
- readme: update flags building with make-ring.py
- tests: avoid using pandoc
Change-Id: I97dea21ca7c720c2d619c44bfa7dae5290de72f9
---
CMakeLists.txt | 78 +++++++++++++++++++++++++++++++++++++-----------
README.md | 4 +--
compile_tests.sh | 3 +-
jami-qt.pro | 20 +++++++++----
4 files changed, 79 insertions(+), 26 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b676ebce..a2b566b46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,8 +18,18 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
set(QML_RESOURCES ${CMAKE_SOURCE_DIR}/resources.qrc)
set(QML_RESOURCES_QML ${CMAKE_SOURCE_DIR}/qml.qrc)
-# todo: check LRC exists?
-set(LRC ${CMAKE_CURRENT_SOURCE_DIR}/../install/lrc)
+if(NOT DEFINED LRC)
+ set(LRC ${CMAKE_CURRENT_SOURCE_DIR}/../install/lrc)
+ set(LRCPATH ${LRC}/include/libringclient)
+ set(LRCLIBDIR ${LRC}/lib)
+else()
+ set(LRCPATH ${LRC}/src)
+ if (NOT DEFINED LRCBUILD)
+ set(LRCLIBDIR ${LRC}/build)
+ else()
+ set(LRCLIBDIR ${LRCBUILD})
+ endif()
+endif()
set(QML_LIBS
Qt5::Quick
@@ -68,9 +78,12 @@ set(COMMON_SOURCES
${SRC_DIR}/videoformatresolutionmodel.cpp
${SRC_DIR}/audiomanagerlistmodel.cpp
${SRC_DIR}/qmlregister.cpp
- ${SRC_DIR}/utilsadapter.cpp)
+ ${SRC_DIR}/utilsadapter.cpp
+ ${SRC_DIR}/dbuserrorhandler.cpp
+ ${SRC_DIR}/xrectsel.c)
set(COMMON_HEADERS
+ ${SRC_DIR}/avatarimageprovider.h
${SRC_DIR}/networkmanager.h
${SRC_DIR}/smartlistmodel.h
${SRC_DIR}/updatemanager.h
@@ -115,7 +128,9 @@ set(COMMON_HEADERS
${SRC_DIR}/audiomanagerlistmodel.h
${SRC_DIR}/qmlregister.h
${SRC_DIR}/qtutils.h
- ${SRC_DIR}/utilsadapter.h)
+ ${SRC_DIR}/utilsadapter.h
+ ${SRC_DIR}/dbuserrorhandler.h
+ ${SRC_DIR}/xrectsel.h)
find_package(PkgConfig REQUIRED)
pkg_check_modules(LIBNM libnm)
@@ -124,20 +139,43 @@ if(LIBNM_FOUND)
add_definitions(-DUSE_LIBNM)
endif()
-find_package(Qt5 CONFIG REQUIRED
- Core
- Quick
- QuickWidgets
- Network
- Svg
- QuickControls2
- WebEngine
- DBus)
+if(QT5_VER AND QT5_PATH)
+ string(REPLACE "." ";" VERSION_LIST ${QT5_VER})
+ list(GET VERSION_LIST 0 QT5_VER_MAJOR)
+ list(GET VERSION_LIST 1 QT5_VER_MINOR)
+ list(GET VERSION_LIST 2 QT5_VER_PATCH)
+
+ if ((${QT5_VER_MAJOR} GREATER_EQUAL 5) AND (${QT5_VER_MINOR} GREATER_EQUAL 14))
+ message(STATUS "Using custom Qt version")
+ find_package(Qt5 ${QT5_VER} REQUIRED
+ COMPONENTS
+ Core
+ Quick
+ QuickWidgets
+ Network
+ Svg
+ QuickControls2
+ WebEngine
+ DBus
+ PATHS ${QT5_PATH} NO_DEFAULT_PATH)
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
+ endif()
+else()
+ find_package(Qt5 REQUIRED
+ COMPONENTS
+ Core
+ Quick
+ QuickWidgets
+ Network
+ Svg
+ QuickControls2
+ WebEngine
+ DBus)
+endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${SRC_DIR}
- ${LRC}/include/libringclient
- ${LRC}/include
+ ${LRCPATH}
${LIBNM_INCLUDE_DIRS})
link_libraries(${LIBNM_LIBRARIES})
@@ -149,13 +187,19 @@ add_executable(${PROJECT_NAME}
${QML_RESOURCES}
${QML_RESOURCES_QML})
-find_library(ringclient ringclient ${LRC}/lib NO_DEFAULT_PATH)
+message(${LRCLIBDIR})
+find_library(ringclient ringclient ${LRCLIBDIR} NO_DEFAULT_PATH)
find_library(qrencode qrencode)
+find_library(X11 X11)
target_link_libraries(jami-qt
${QML_LIBS}
${ringclient}
${qrencode}
+ ${X11}
)
-add_subdirectory(tests)
+if(ENABLE_TESTS)
+ message("Add Jami tests")
+ add_subdirectory(tests)
+endif()
diff --git a/README.md b/README.md
index bcd6bfd7e..acd991931 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ Then you will need to install dependencies:
+ For GNU/Linux
```bash
-./make-ring.py --dependencies # needs sudo
+./make-ring.py --dependencies --qt # needs sudo
```
Then, you can build daemon, lrc and client-qt with:
@@ -81,7 +81,7 @@ And you will have the daemon in `daemon/bin/dring` and the client in `client-qt/
cd client-qt
mkdir build
cd build
-${YOUR_QT5_gcc64_PATH}/bin/qmake /jami-qt.pro
+${YOUR_QT5_gcc64_PATH}/bin/qmake ../jami-qt.pro
make -j9
```
diff --git a/compile_tests.sh b/compile_tests.sh
index 42d1a1d91..26c5759f4 100755
--- a/compile_tests.sh
+++ b/compile_tests.sh
@@ -21,7 +21,7 @@ echo "Building lrc in "$PWD
cmake .. -DCMAKE_INSTALL_PREFIX=$installDir/lrc \
-DRING_INCLUDE_DIR=$daemonDir/src/dring \
-DRING_XML_INTERFACES_DIR=$daemonDir/bin/dbus
-make
+make -j${cpuCount}
make install
# Build client and tests
@@ -29,7 +29,6 @@ cd $clientDir
mkdir -p build
cd build
echo "Building client in "$PWD
-pandoc -f markdown -t html5 -o ../changelog.html ../changelog.md
cmake ..
make -j${cpuCount}
diff --git a/jami-qt.pro b/jami-qt.pro
index 69bffcb45..5fb17626e 100644
--- a/jami-qt.pro
+++ b/jami-qt.pro
@@ -95,13 +95,23 @@ unix {
QMAKE_CXXFLAGS += -std=c++17
}
- isEmpty(LRC) { LRC=$$PWD/../install/lrc/ }
-
- INCLUDEPATH += $${LRC}/include/libringclient
- INCLUDEPATH += $${LRC}/include
INCLUDEPATH += ../src
- LIBS += -L$${LRC}/lib -lringclient
+ isEmpty(LRC) {
+ LRC=$$PWD/../install/lrc
+ INCLUDEPATH += $${LRC}/include/libringclient
+ LIBDIR = $${LRC}/lib
+ } else {
+ INCLUDEPATH += $${LRC}/src
+ isEmpty(LRCBUILD) {
+ LIBDIR = $${LRC}/build
+ } else {
+ LIBDIR = $${LRCBUILD}
+ }
+ }
+ QMAKE_RPATHDIR += $${LIBDIR}
+
+ LIBS += -L$${LIBDIR} -lringclient
LIBS += -lqrencode
LIBS += -lX11
--
GitLab