From b117a60e81c3d67880cd8b0079041c92a0818d96 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 3 Nov 2013 11:12:42 +0100
Subject: Allow building without NaCl again

---
 cmake/deps.cmake | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'cmake/deps.cmake')

diff --git a/cmake/deps.cmake b/cmake/deps.cmake
index fa3cb03..c3936af 100644
--- a/cmake/deps.cmake
+++ b/cmake/deps.cmake
@@ -17,24 +17,30 @@ set(NACL_LIBRARIES "")
 set(NACL_LDFLAGS_OTHER "")
 
 if(USE_LIBSODIUM)
-  pkg_check_modules(SODIUM REQUIRED libsodium)
-
-  set(NACL_INCLUDE_DIRS "${SODIUM_INCLUDE_DIRS}")
-  foreach(dir "${SODIUM_INCLUDEDIR}" ${SODIUM_INCLUDE_DIRS})
-    list(APPEND NACL_INCLUDE_DIRS "${dir}/sodium")
-  endforeach(dir)
-
-  set(NACL_CFLAGS_OTHER "${SODIUM_CFLAGS_OTHER}")
-  set(NACL_LIBRARY_DIRS "${SODIUM_LIBRARY_DIRS}")
-  set(NACL_LIBRARIES "${SODIUM_LIBRARIES}")
-  set(NACL_LDFLAGS_OTHER "${SODIUM_LDFLAGS_OTHER}")
+  pkg_check_modules(SODIUM libsodium)
+
+  if(SODIUM_FOUND)
+    set(NACL_INCLUDE_DIRS "${SODIUM_INCLUDE_DIRS}")
+    foreach(dir "${SODIUM_INCLUDEDIR}" ${SODIUM_INCLUDE_DIRS})
+      list(APPEND NACL_INCLUDE_DIRS "${dir}/sodium")
+    endforeach(dir)
+
+    set(NACL_CFLAGS_OTHER "${SODIUM_CFLAGS_OTHER}")
+    set(NACL_LIBRARY_DIRS "${SODIUM_LIBRARY_DIRS}")
+    set(NACL_LIBRARIES "${SODIUM_LIBRARIES}")
+    set(NACL_LDFLAGS_OTHER "${SODIUM_LDFLAGS_OTHER}")
+  endif(SODIUM_FOUND)
 else(USE_LIBSODIUM)
-  find_package(NaCl REQUIRED)
+  find_package(NaCl)
 
-  set(NACL_INCLUDE_DIRS "${NACL_INCLUDE_DIR}")
-  set(NACL_LIBRARIES "${NACL_LIBRARY}")
+  if(NACL_FOUND)
+    set(NACL_INCLUDE_DIRS "${NACL_INCLUDE_DIR}")
+    set(NACL_LIBRARIES "${NACL_LIBRARY}")
+  endif(NACL_FOUND)
 endif(USE_LIBSODIUM)
 
+set_property(GLOBAL PROPERTY NACL_REQUIRED FALSE)
+
 
 if(WITH_CAPABILITIES)
   find_package(CAP REQUIRED)
-- 
cgit v1.2.3