From 3ef91eebb2452a2902bde5773054c914f9bfa5cc Mon Sep 17 00:00:00 2001
From: Vladimir Stoiakin <VStoiakin@lavabit.com>
Date: Tue, 23 Jun 2020 13:37:00 +0300
Subject: [PATCH] build: search for libjami also
Change-Id: I5a78e77d34ce19372e3785f93c997274e6a5c647
---
cmake/FindRing.cmake | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/cmake/FindRing.cmake b/cmake/FindRing.cmake
index 0811738c..c503d502 100644
--- a/cmake/FindRing.cmake
+++ b/cmake/FindRing.cmake
@@ -25,6 +25,15 @@ FIND_LIBRARY(ring_BIN NAMES ring
PATHS ${CMAKE_INSTALL_PREFIX}/bin
)
+IF(${ring_BIN} MATCHES "")
+ FIND_LIBRARY(ring_BIN NAMES jami
+ PATHS ${RING_BUILD_DIR}/.libs
+ PATHS ${CMAKE_INSTALL_PREFIX}/lib
+ PATHS ${CMAKE_INSTALL_PREFIX}/libexec
+ PATHS ${CMAKE_INSTALL_PREFIX}/bin
+ )
+ENDIF()
+
# Try a static version too
IF(${ring_BIN} MATCHES "")
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.lib")
@@ -35,6 +44,14 @@ IF(${ring_BIN} MATCHES "")
PATHS ${CMAKE_INSTALL_PREFIX}/libexec
)
+ IF(${ring_BIN} MATCHES "")
+ FIND_LIBRARY(ring_BIN NAMES jami
+ PATHS ${RING_BUILD_DIR}/.libs
+ PATHS ${CMAKE_INSTALL_PREFIX}/lib
+ PATHS ${CMAKE_INSTALL_PREFIX}/libexec
+ )
+ ENDIF()
+
IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
ADD_DEFINITIONS(-fPIC)
ENDIF()
--
GitLab