From 3f1bc76c08b7c271e438e9afd15bdae2c01a5514 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Thu, 13 Oct 2022 15:05:36 -0400 Subject: [PATCH] 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 --- extras/build/cmake/modules/FindLibJami.cmake | 49 ++------------------ 1 file changed, 4 insertions(+), 45 deletions(-) diff --git a/extras/build/cmake/modules/FindLibJami.cmake b/extras/build/cmake/modules/FindLibJami.cmake index 6594076a..5aa72a9a 100644 --- a/extras/build/cmake/modules/FindLibJami.cmake +++ b/extras/build/cmake/modules/FindLibJami.cmake @@ -48,39 +48,17 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES_orig ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib;.so;.dll") # Search only in these given PATHS. -find_library(LIBJAMI_LIB NAMES jami +find_library(LIBJAMI_LIB NAMES jami ring PATHS ${LIBJAMI_BUILD_DIR}/.libs PATHS ${RING_BUILD_DIR}/.libs PATHS ${CMAKE_INSTALL_PREFIX}/lib PATHS ${CMAKE_INSTALL_PREFIX}/libexec PATHS ${CMAKE_INSTALL_PREFIX}/bin NO_DEFAULT_PATH) -if(NOT LIBJAMI_LIB) - find_library(LIBJAMI_LIB NAMES ring - PATHS ${LIBJAMI_BUILD_DIR}/.libs - PATHS ${RING_BUILD_DIR}/.libs - PATHS ${CMAKE_INSTALL_PREFIX}/lib - PATHS ${CMAKE_INSTALL_PREFIX}/libexec - PATHS ${CMAKE_INSTALL_PREFIX}/bin - NO_DEFAULT_PATH) -endif() # Search elsewhere as well (e.g. system-wide). if(NOT LIBJAMI_LIB) - find_library(LIBJAMI_LIB NAMES jami - PATHS ${LIBJAMI_BUILD_DIR}/.libs - PATHS ${RING_BUILD_DIR}/.libs - PATHS ${CMAKE_INSTALL_PREFIX}/lib - PATHS ${CMAKE_INSTALL_PREFIX}/libexec - PATHS ${CMAKE_INSTALL_PREFIX}/bin) - if(NOT LIBJAMI_LIB) - find_library(LIBJAMI_LIB NAMES ring - PATHS ${LIBJAMI_BUILD_DIR}/.libs - PATHS ${RING_BUILD_DIR}/.libs - PATHS ${CMAKE_INSTALL_PREFIX}/lib - PATHS ${CMAKE_INSTALL_PREFIX}/libexec - PATHS ${CMAKE_INSTALL_PREFIX}/bin) - endif() + find_library(LIBJAMI_LIB NAMES jami ring) endif() # Try for a static version also. @@ -88,35 +66,16 @@ if(NOT LIBJAMI_LIB) set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.lib") # Search only in these given PATHS. - find_library(LIBJAMI_LIB NAMES jami + find_library(LIBJAMI_LIB NAMES jami ring PATHS ${LIBJAMI_BUILD_DIR}/.libs PATHS ${RING_BUILD_DIR}/.libs PATHS ${CMAKE_INSTALL_PREFIX}/lib PATHS ${CMAKE_INSTALL_PREFIX}/libexec NO_DEFAULT_PATH) - if(NOT LIBJAMI_LIB) - find_library(LIBJAMI_LIB NAMES ring - PATHS ${LIBJAMI_BUILD_DIR}/.libs - PATHS ${RING_BUILD_DIR}/.libs - PATHS ${CMAKE_INSTALL_PREFIX}/lib - PATHS ${CMAKE_INSTALL_PREFIX}/libexec - NO_DEFAULT_PATH) - endif() # Search elsewhere as well (e.g. system-wide). if(NOT LIBJAMI_LIB) - find_library(LIBJAMI_LIB NAMES jami - PATHS ${LIBJAMI_BUILD_DIR}/.libs - PATHS ${RING_BUILD_DIR}/.libs - PATHS ${CMAKE_INSTALL_PREFIX}/lib - PATHS ${CMAKE_INSTALL_PREFIX}/libexec) - if(NOT LIBJAMI_LIB) - find_library(LIBJAMI_LIB NAMES ring - PATHS ${LIBJAMI_BUILD_DIR}/.libs - PATHS ${RING_BUILD_DIR}/.libs - PATHS ${CMAKE_INSTALL_PREFIX}/lib - PATHS ${CMAKE_INSTALL_PREFIX}/libexec) - endif() + find_library(LIBJAMI_LIB NAMES jami ring) endif() if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")