lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-07-27 02:45:34 +02:00
Code Activity

Reinstate "cmake: Simplify lookup logic for libjami headers."

Browse source 
The commit was reverted in 2b7a421e due to breaking some of the
packaging builds.  This has now been rectified.

Change-Id: I3ea67962cc65f243f106fe00316634d580f51a52
This commit is contained in:
Maxim Cournoyer 2023-03-24 22:10:02 -04:00 • committed by Sébastien Blin
parent a7e9ea8e22
commit f6c8197cba
4 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -145,7 +145,7 @@ set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules") ${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules")
find_package(LibJami REQUIRED) find_package(LibJami REQUIRED)
if(LIBJAMI_FOUND) if(LIBJAMI_FOUND)
include_directories(${LIBJAMI_INCLUDE_DIRS}) include_directories(${LIBJAMI_INCLUDE_DIR})
endif() endif()
include(FindPython3) include(FindPython3)

23
extras/build/cmake/modules/FindLibJami.cmake
View file

@ -20,30 +20,19 @@
# Once done, this find module will set: # Once done, this find module will set:
# #
# LIBJAMI_INCLUDE_DIRS - libjami include directories # LIBJAMI_INCLUDE_DIR - libjami include directory
# LIBJAMI_FOUND - whether it was able to find the include directories # LIBJAMI_FOUND - whether it was able to find the include directories
# LIBJAMI_LIB - path to libjami or libring library # LIBJAMI_LIB - path to libjami or libring library
set(LIBJAMI_FOUND true) set(LIBJAMI_FOUND true)
if(WITH_DAEMON_SUBMODULE) if(WITH_DAEMON_SUBMODULE)
set(LIBJAMI_INCLUDE_DIRS ${DAEMON_DIR}/src/jami) set(LIBJAMI_INCLUDE_DIR ${DAEMON_DIR}/src/jami)
else() else()
if(EXISTS ${LIBJAMI_INCLUDE_DIR}/jami.h) find_path(LIBJAMI_INCLUDE_DIR jami.h PATH_SUFFIXES jami)
set(LIBJAMI_INCLUDE_DIRS ${LIBJAMI_INCLUDE_DIR}) if(NOT LIBJAMI_INCLUDE_DIR)
elseif(EXISTS ${LIBJAMI_BUILD_DIR}/jami/jami.h)
set(LIBJAMI_INCLUDE_DIRS ${LIBJAMI_BUILD_DIR}/jami)
elseif(EXISTS ${RING_INCLUDE_DIR}/jami.h)
set(LIBJAMI_INCLUDE_DIRS ${RING_INCLUDE_DIR})
elseif(EXISTS ${RING_BUILD_DIR}/jami/jami.h)
set(LIBJAMI_INCLUDE_DIRS ${RING_BUILD_DIR}/jami)
elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/include/jami/jami.h)
set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/jami)
elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami/jami.h)
set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami)
else()
message(STATUS "Jami daemon headers not found! message(STATUS "Jami daemon headers not found!
Set -DLIBJAMI_BUILD_DIR or -DCMAKE_INSTALL_PREFIX") To build using the daemon git submodule, set -DWITH_DAEMON_SUBMODULE")
set(LIBJAMI_FOUND false) set(LIBJAMI_FOUND false)
endif() endif()
endif() endif()
@ -115,5 +104,5 @@ endif()
# Restore the original value of CMAKE_FIND_LIBRARY_SUFFIXES. # Restore the original value of CMAKE_FIND_LIBRARY_SUFFIXES.
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_orig}) set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_orig})
message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIRS}) message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR})
message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB}) message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB})

2
src/libclient/CMakeLists.txt
View file

@ -62,7 +62,7 @@ set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules") ${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules")
find_package(LibJami REQUIRED) find_package(LibJami REQUIRED)
if(LIBJAMI_FOUND) if(LIBJAMI_FOUND)
include_directories(${LIBJAMI_INCLUDE_DIRS}) include_directories(${LIBJAMI_INCLUDE_DIR})
endif() endif()
string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT) string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT)

2
src/libclient/qtwrapper/CMakeLists.txt
View file

@ -46,7 +46,7 @@ else()
endif() endif()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${LIBJAMI_INCLUDE_DIRS}) include_directories(${LIBJAMI_INCLUDE_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../dbus) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../dbus)