From 9b4202dd55870990b24f7d1a7f26ee3a84683024 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 25 Mar 2016 03:17:06 +0100 Subject: build: always try to find libraries without CMAKE_FIND_ROOT_PATH first Fixes build on Android --- cmake/Findlibsodium.cmake | 3 +++ cmake/Findlibuecc.cmake | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cmake/Findlibsodium.cmake b/cmake/Findlibsodium.cmake index a82063a..83f8d75 100644 --- a/cmake/Findlibsodium.cmake +++ b/cmake/Findlibsodium.cmake @@ -14,7 +14,10 @@ endif(ANDROID) pkg_check_modules(_LIBSODIUM libsodium) +find_path(LIBSODIUM_INCLUDE_DIR NAMES sodium/crypto_stream.h HINTS ${_LIBSODIUM_INCLUDE_DIRS} NO_CMAKE_FIND_ROOT_PATH) find_path(LIBSODIUM_INCLUDE_DIR NAMES sodium/crypto_stream.h HINTS ${_LIBSODIUM_INCLUDE_DIRS}) + +find_library(LIBSODIUM_LIBRARIES NAMES sodium HINTS ${_LIBSODIUM_LIBRARY_DIRS} NO_CMAKE_FIND_ROOT_PATH) find_library(LIBSODIUM_LIBRARIES NAMES sodium HINTS ${_LIBSODIUM_LIBRARY_DIRS}) set(LIBSODIUM_CFLAGS_OTHER "${_LIBSODIUM_CFLAGS_OTHER}" CACHE STRING "Additional compiler flags for libsodium") diff --git a/cmake/Findlibuecc.cmake b/cmake/Findlibuecc.cmake index b1852d6..8c2e1a8 100644 --- a/cmake/Findlibuecc.cmake +++ b/cmake/Findlibuecc.cmake @@ -14,7 +14,10 @@ endif(ANDROID) pkg_check_modules(_LIBUECC libuecc>=6) +find_path(LIBUECC_INCLUDE_DIR NAMES libuecc/ecc.h HINTS ${_LIBUECC_INCLUDE_DIRS} NO_CMAKE_FIND_ROOT_PATH) find_path(LIBUECC_INCLUDE_DIR NAMES libuecc/ecc.h HINTS ${_LIBUECC_INCLUDE_DIRS}) + +find_library(LIBUECC_LIBRARIES NAMES uecc HINTS ${_LIBUECC_LIBRARY_DIRS} NO_CMAKE_FIND_ROOT_PATH) find_library(LIBUECC_LIBRARIES NAMES uecc HINTS ${_LIBUECC_LIBRARY_DIRS}) set(LIBUECC_CFLAGS_OTHER "${_LIBUECC_CFLAGS_OTHER}" CACHE STRING "Additional compiler flags for libuecc") -- cgit v1.2.3