1 files changed, 26 insertions, 41 deletions
diff --git a/cmake/deps.cmake b/cmake/deps.cmake
index ce3ca1b..38f1b49 100644
--- a/cmake/deps.cmake
+++ b/cmake/deps.cmake
@@ -6,71 +6,56 @@ endif(NOT DARWIN)
 
 if(ANDROID)
   find_host_package(BISON 2.5 REQUIRED)
-  find_host_package(PkgConfig REQUIRED)
 else(ANDROID)
   find_package(BISON 2.5 REQUIRED)
-  find_package(PkgConfig REQUIRED)
 endif(ANDROID)
 
-pkg_check_modules(UECC REQUIRED libuecc>=5)
+find_package(libuecc REQUIRED)
 
-
-set(NACL_INCLUDE_DIRS "")
-set(NACL_CFLAGS_OTHER "")
-set(NACL_LIBRARY_DIRS "")
-set(NACL_LIBRARIES "")
-set(NACL_LDFLAGS_OTHER "")
+set(NACL_INCLUDE_DIR)
+set(NACL_CFLAGS_OTHER)
+set(NACL_LIBRARIES)
+set(NACL_LDFLAGS_OTHER)
 
 if(ENABLE_LIBSODIUM)
-  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)
+  find_package(libsodium)
+
+  if(LIBSODIUM_FOUND)
+    set(NACL_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}")
+  endif(LIBSODIUM_FOUND)
 else(ENABLE_LIBSODIUM)
   find_package(NaCl)
 
-  if(NACL_FOUND)
-    set(NACL_INCLUDE_DIRS "${NACL_INCLUDE_DIR}")
-    set(NACL_LIBRARIES "${NACL_LIBRARY}")
-  endif(NACL_FOUND)
+  set(NACL_LIBRARIES "${NACL_LIBRARY}")
 endif(ENABLE_LIBSODIUM)
 
 set_property(GLOBAL PROPERTY NACL_REQUIRED FALSE)
 
 
 if(ENABLE_OPENSSL)
-  pkg_check_modules(OPENSSL_CRYPTO REQUIRED libcrypto)
+  find_package(OpenSSL REQUIRED)
 else(ENABLE_OPENSSL)
-  set(OPENSSL_CRYPTO_INCLUDE_DIRS "")
-  set(OPENSSL_CRYPTO_CFLAGS_OTHER "")
-  set(OPENSSL_CRYPTO_LIBRARY_DIRS "")
-  set(OPENSSL_CRYPTO_LIBRARIES "")
-  set(OPENSSL_CRYPTO_LDFLAGS_OTHER "")
+  set(OPENSSL_INCLUDE_DIR)
+  set(OPENSSL_CRYPTO_LIBRARY)
 endif(ENABLE_OPENSSL)
 
 
 if(WITH_CAPABILITIES)
-  find_package(CAP REQUIRED)
+  find_package(libcap REQUIRED)
 else(WITH_CAPABILITIES)
-  set(CAP_INCLUDE_DIR "")
-  set(CAP_LIBRARY "")
+  set(LIBCAP_INCLUDE_DIR)
+  set(LIBCAP_LIBRARY)
 endif(WITH_CAPABILITIES)
 
 if(WITH_STATUS_SOCKET)
-  pkg_check_modules(JSONC REQUIRED json-c)
+  find_package(JSON_C REQUIRED)
 else(WITH_STATUS_SOCKET)
-  set(JSONC_INCLUDE_DIRS "")
-  set(JSONC_CFLAGS_OTHER "")
-  set(JSONC_LIBRARY_DIRS "")
-  set(JSONC_LIBRARIES "")
-  set(JSONC_LDFLAGS_OTHER "")
+  set(JSON_C_INCLUDE_DIRS)
+  set(JSON_C_CFLAGS_OTHER)
+  set(JSON_C_LIBRARY_DIRS)
+  set(JSON_C_LIBRARIES)
+  set(JSON_C_LDFLAGS_OTHER)
 endif(WITH_STATUS_SOCKET)