From f9e44f44ee8fa9e939bcb8c3cd2839f139926365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Pettersson?= Date: Mon, 30 Apr 2018 17:18:20 +0200 Subject: [PATCH] cmake: fix tox library detection toxcore may be built as either a single monolithic library, or multiple libraries (core, AV, encrypted savefiles). This updates the CMake find module to work in both configurations. Fixes . --- cmake/FindTox.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmake/FindTox.cmake b/cmake/FindTox.cmake index abba2ba..1295b0d 100644 --- a/cmake/FindTox.cmake +++ b/cmake/FindTox.cmake @@ -24,8 +24,10 @@ find_path(Tox_CORE_INCLUDE_DIR tox/tox.h) find_library(Tox_CORE_LIBRARY toxcore) find_path(Tox_AV_INCLUDE_DIR tox/toxav.h) +find_library(Tox_AV_LIBRARY toxav) find_path(Tox_ENCRYPTSAVE_INCLUDE_DIR tox/toxencryptsave.h) +find_library(Tox_ENCRYPTSAVE_LIBRARY toxencryptsave) if(Tox_CORE_INCLUDE_DIR AND Tox_CORE_LIBRARY) set(Tox_CORE_FOUND TRUE) @@ -36,11 +38,17 @@ endif() if(Tox_AV_INCLUDE_DIR) set(Tox_AV_FOUND TRUE) list(APPEND Tox_INCLUDE_DIRS "${Tox_AV_INCLUDE_DIR}") + if(Tox_AV_LIBRARY) + list(APPEND Tox_LIBRARIES "${Tox_AV_LIBRARY}") + endif() endif() if(Tox_ENCRYPTSAVE_INCLUDE_DIR) set(Tox_ENCRYPTSAVE_FOUND TRUE) list(APPEND Tox_INCLUDE_DIRS "${Tox_ENCRYPTSAVE_INCLUDE_DIR}") + if(Tox_ENCRYPTSAVE_LIBRARY) + list(APPEND Tox_LIBRARIES "${Tox_ENCRYPTSAVE_LIBRARY}") + endif() endif() list(REMOVE_DUPLICATES Tox_INCLUDE_DIRS)