diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-03-27 03:24:01 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-03-27 03:24:27 +0200 |
| commit | 794caa0da080dd0252d7725027ccd20a143bb914 (patch) | |
| tree | 8486b54c592c4cc2b35a6b246d887a6e39b9ba63 /cmake | |
| parent | 7e3159dc35997cbbd62c1fe61b5f51ac3a154213 (diff) | |
| download | fastd-794caa0da080dd0252d7725027ccd20a143bb914.tar fastd-794caa0da080dd0252d7725027ccd20a143bb914.zip | |
build: fix build with nonstandard libsodium include path
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/deps.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
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) |