From 794caa0da080dd0252d7725027ccd20a143bb914 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 27 Mar 2016 03:24:01 +0200 Subject: build: fix build with nonstandard libsodium include path --- cmake/deps.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cmake') diff --git a/cmake/deps.cmake b/cmake/deps.cmake index ec77e1d..016255e 100644 --- a/cmake/deps.cmake +++ b/cmake/deps.cmake @@ -12,7 +12,7 @@ endif(ANDROID) find_package(libuecc REQUIRED) -set(NACL_INCLUDE_DIR) +set(NACL_INCLUDE_DIRS) set(NACL_CFLAGS_OTHER) set(NACL_LIBRARIES) set(NACL_LDFLAGS_OTHER) @@ -21,7 +21,7 @@ if(ENABLE_LIBSODIUM) find_package(libsodium) if(LIBSODIUM_FOUND) - set(NACL_INCLUDE_DIR "${LIBSODIUM_INCLUDE_DIR}/sodium") + set(NACL_INCLUDE_DIRS "${LIBSODIUM_INCLUDE_DIR};${LIBSODIUM_INCLUDE_DIR}/sodium") set(NACL_LIBRARIES "${LIBSODIUM_LIBRARIES}") set(NACL_CFLAGS_OTHER "${LIBSODIUM_CFLAGS_OTHER}") set(NACL_LDFLAGS_OTHER "${LIBSODIUM_LDFLAGS_OTHER}") @@ -29,6 +29,7 @@ if(ENABLE_LIBSODIUM) else(ENABLE_LIBSODIUM) find_package(NaCl) + set(NACL_INCLUDE_DIRS "${NACL_INCLUDE_DIR}") set(NACL_LIBRARIES "${NACL_LIBRARY}") endif(ENABLE_LIBSODIUM) -- cgit v1.2.3