summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2016-03-25 03:17:06 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2016-03-25 03:17:06 +0100
commit9b4202dd55870990b24f7d1a7f26ee3a84683024 (patch)
tree6590635091f3cde8e132018f58b22cf292c8ddf1 /cmake
parent1e8fb62a0e33e969a4abf06f92fe801e772d572b (diff)
downloadfastd-9b4202dd55870990b24f7d1a7f26ee3a84683024.tar
fastd-9b4202dd55870990b24f7d1a7f26ee3a84683024.zip
build: always try to find libraries without CMAKE_FIND_ROOT_PATH first
Fixes build on Android
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Findlibsodium.cmake3
-rw-r--r--cmake/Findlibuecc.cmake3
2 files changed, 6 insertions, 0 deletions
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")