Make build dependencies more configurable

8 files changed, 12 insertions, 12 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 09868df..20813ce 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,7 @@
 set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE __APPLE_USE_RFC_3542)
-set(FASTD_CFLAGS "${PTHREAD_CFLAGS} -std=c99 ${UECC_CFLAGS_OTHER} ${NACL_CFLAGS_OTHER} ${OPENSSL_CRYPTO_CFLAGS_OTHER} ${JSONC_CFLAGS_OTHER} ${CFLAGS_LTO} -Wall")
+set(FASTD_CFLAGS "${PTHREAD_CFLAGS} -std=c99 ${LIBUECC_CFLAGS_OTHER} ${LIBNACL_CFLAGS_OTHER} ${JSON_C_CFLAGS_OTHER} ${CFLAGS_LTO} -Wall")
 
 include_directories(${FASTD_SOURCE_DIR} ${FASTD_BINARY_DIR}/src)
-link_directories(${UECC_LIBRARY_DIRS} ${NACL_LIBRARY_DIRS} ${OPENSSL_CRYPTO_LIBRARY_DIRS} ${JSONC_LIBRARY_DIRS})
 
 
 include(generate_version)
@@ -45,9 +44,9 @@ add_executable(fastd
   ${BISON_fastd_config_parse_OUTPUTS}
 )
 set_property(TARGET fastd PROPERTY COMPILE_FLAGS "${FASTD_CFLAGS}")
-set_property(TARGET fastd PROPERTY LINK_FLAGS "${PTHREAD_LDFLAGS} ${UECC_LDFLAGS_OTHER} ${NACL_LDFLAGS_OTHER} ${OPENSSL_CRYPTO_LDFLAGS_OTHER} ${JSONC_LDFLAGS_OTHER} ${LDFLAGS_LTO}")
-set_property(TARGET fastd APPEND PROPERTY INCLUDE_DIRECTORIES ${CAP_INCLUDE_DIR} ${NACL_INCLUDE_DIRS} ${JSONC_INCLUDE_DIRS})
-target_link_libraries(fastd protocols methods ciphers macs ${RT_LIBRARY} ${CAP_LIBRARY} ${UECC_LIBRARIES} ${NACL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES} ${JSONC_LIBRARIES})
+set_property(TARGET fastd PROPERTY LINK_FLAGS "${PTHREAD_LDFLAGS} ${LIBUECC_LDFLAGS_OTHER} ${NACL_LDFLAGS_OTHER} ${JSON_C_LDFLAGS_OTHER} ${LDFLAGS_LTO}")
+set_property(TARGET fastd APPEND PROPERTY INCLUDE_DIRECTORIES ${LIBCAP_INCLUDE_DIR} ${NACL_INCLUDE_DIR} ${JSON_C_INCLUDE_DIR})
+target_link_libraries(fastd protocols methods ciphers macs ${RT_LIBRARY} ${LIBCAP_LIBRARY} ${LIBUECC_LIBRARIES} ${NACL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARY} ${JSON_C_LIBRARIES})
 
 add_dependencies(fastd version)
 
diff --git a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt
index 676aa5d..0740c7d 100644
--- a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt
+++ b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt
@@ -1,6 +1,6 @@
 fastd_cipher_impl(aes128-ctr nacl
   cipher_aes128_ctr_nacl.c
 )
-fastd_cipher_impl_include_directories(aes128-ctr nacl ${NACL_INCLUDE_DIRS})
+fastd_cipher_impl_include_directories(aes128-ctr nacl ${NACL_INCLUDE_DIR})
 fastd_cipher_impl_link_libraries(aes128-ctr nacl ${NACL_LIBRARIES})
 fastd_cipher_impl_require(aes128-ctr nacl NACL)
diff --git a/src/crypto/cipher/aes128_ctr/openssl/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/openssl/CMakeLists.txt
index 18389f5..566ac49 100644
--- a/src/crypto/cipher/aes128_ctr/openssl/CMakeLists.txt
+++ b/src/crypto/cipher/aes128_ctr/openssl/CMakeLists.txt
@@ -2,5 +2,5 @@ if(ENABLE_OPENSSL)
   fastd_cipher_impl(aes128-ctr openssl
     aes128_ctr_openssl.c
   )
-  fastd_cipher_impl_include_directories(aes128-ctr openssl ${OPENSSL_INCLUDE_DIRS})
+  fastd_cipher_impl_include_directories(aes128-ctr openssl ${OPENSSL_INCLUDE_DIR})
 endif(ENABLE_OPENSSL)
diff --git a/src/crypto/cipher/salsa20/nacl/CMakeLists.txt b/src/crypto/cipher/salsa20/nacl/CMakeLists.txt
index d76ff34..2b550c1 100644
--- a/src/crypto/cipher/salsa20/nacl/CMakeLists.txt
+++ b/src/crypto/cipher/salsa20/nacl/CMakeLists.txt
@@ -1,6 +1,6 @@
 fastd_cipher_impl(salsa20 nacl
   salsa20_nacl.c
 )
-fastd_cipher_impl_include_directories(salsa20 nacl ${NACL_INCLUDE_DIRS})
+fastd_cipher_impl_include_directories(salsa20 nacl ${NACL_INCLUDE_DIR})
 fastd_cipher_impl_link_libraries(salsa20 nacl ${NACL_LIBRARIES})
 fastd_cipher_impl_require(salsa20 nacl NACL)
diff --git a/src/crypto/cipher/salsa2012/nacl/CMakeLists.txt b/src/crypto/cipher/salsa2012/nacl/CMakeLists.txt
index 3d47621..54487e7 100644
--- a/src/crypto/cipher/salsa2012/nacl/CMakeLists.txt
+++ b/src/crypto/cipher/salsa2012/nacl/CMakeLists.txt
@@ -1,6 +1,6 @@
 fastd_cipher_impl(salsa2012 nacl
   salsa2012_nacl.c
 )
-fastd_cipher_impl_include_directories(salsa2012 nacl ${NACL_INCLUDE_DIRS})
+fastd_cipher_impl_include_directories(salsa2012 nacl ${NACL_INCLUDE_DIR})
 fastd_cipher_impl_link_libraries(salsa2012 nacl ${NACL_LIBRARIES})
 fastd_cipher_impl_require(salsa2012 nacl NACL)
diff --git a/src/methods/generic_poly1305/CMakeLists.txt b/src/methods/generic_poly1305/CMakeLists.txt
index cafa288..18f2382 100644
--- a/src/methods/generic_poly1305/CMakeLists.txt
+++ b/src/methods/generic_poly1305/CMakeLists.txt
@@ -1,6 +1,6 @@
 fastd_method(generic-poly1305
   generic_poly1305.c
 )
-fastd_method_include_directories(generic-poly1305 ${NACL_INCLUDE_DIRS})
+fastd_method_include_directories(generic-poly1305 ${NACL_INCLUDE_DIR})
 fastd_method_link_libraries(generic-poly1305 method_common ${NACL_LIBRARIES})
 fastd_method_require(generic-poly1305 NACL)
diff --git a/src/methods/xsalsa20_poly1305/CMakeLists.txt b/src/methods/xsalsa20_poly1305/CMakeLists.txt
index 97dee39..7dc2339 100644
--- a/src/methods/xsalsa20_poly1305/CMakeLists.txt
+++ b/src/methods/xsalsa20_poly1305/CMakeLists.txt
@@ -1,6 +1,6 @@
 fastd_method(xsalsa20-poly1305
   xsalsa20_poly1305.c
 )
-fastd_method_include_directories(xsalsa20-poly1305 ${NACL_INCLUDE_DIRS})
+fastd_method_include_directories(xsalsa20-poly1305 ${NACL_INCLUDE_DIR})
 fastd_method_link_libraries(xsalsa20-poly1305 method_common ${NACL_LIBRARIES})
 fastd_method_require(xsalsa20-poly1305 NACL)
diff --git a/src/protocols/ec25519_fhmqvc/CMakeLists.txt b/src/protocols/ec25519_fhmqvc/CMakeLists.txt
index 9252a08..8e6bed0 100644
--- a/src/protocols/ec25519_fhmqvc/CMakeLists.txt
+++ b/src/protocols/ec25519_fhmqvc/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 add_library(protocol_ec25519_fhmqvc OBJECT
   ec25519_fhmqvc.c
   handshake.c
@@ -5,4 +6,4 @@ add_library(protocol_ec25519_fhmqvc OBJECT
   util.c
 )
 set_property(TARGET protocol_ec25519_fhmqvc PROPERTY COMPILE_FLAGS "${FASTD_CFLAGS}")
-set_property(TARGET protocol_ec25519_fhmqvc APPEND PROPERTY INCLUDE_DIRECTORIES ${UECC_INCLUDE_DIRS})
+set_property(TARGET protocol_ec25519_fhmqvc APPEND PROPERTY INCLUDE_DIRECTORIES ${LIBUECC_INCLUDE_DIR})