10 files changed, 48 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c16ce6fe..c18d41d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,14 @@
 cmake_minimum_required(VERSION 2.6.0)
 
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
 #MinGW prints more warnings for -Wall than gcc does, thus causing build to fail
 if(NOT WIN32)
         if(("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
                 message(STATUS "==== ${CMAKE_C_COMPILER_ID} detected - Adding compiler flags ====")
                 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
         endif()
+        find_package(SODIUM REQUIRED)
 endif()
 
 macro(linkCoreLibraries exe_name)
@@ -16,8 +19,9 @@ macro(linkCoreLibraries exe_name)
                 ${CMAKE_SOURCE_DIR}/sodium/lib/libsodium.a
                         ws2_32)
         else()
+                include_directories(${SODIUM_INCLUDE_DIR})
                 target_link_libraries(${exe_name} core
-                        sodium)
+                        ${SODIUM_LIBRARY})
         endif()
 endmacro()
 
@@ -25,4 +29,4 @@ cmake_policy(SET CMP0011 NEW)
 
 add_subdirectory(core)
 add_subdirectory(testing)
-add_subdirectory(other)
\ No newline at end of file
+add_subdirectory(other)
diff --git a/cmake/FindLIBCONFIG.cmake b/cmake/FindLIBCONFIG.cmake
new file mode 100644
index 00000000..d5018240
--- /dev/null
+++ b/cmake/FindLIBCONFIG.cmake
@@ -0,0 +1,15 @@
+# Find LIBCONFIG
+#
+# LIBCONFIG_INCLUDE_DIR
+# LIBCONFIG_LIBRARY
+# LIBCONFIG_FOUND
+#
+
+FIND_PATH(LIBCONFIG_INCLUDE_DIR NAMES libconfig.h)
+
+FIND_LIBRARY(LIBCONFIG_LIBRARY NAMES config)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBCONFIG DEFAULT_MSG LIBCONFIG_LIBRARY LIBCONFIG_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(LIBCONFIG_INCLUDE_DIR LIBCONFIG_LIBRARY)
diff --git a/cmake/FindSODIUM.cmake b/cmake/FindSODIUM.cmake
new file mode 100644
index 00000000..ffb6a1f7
--- /dev/null
+++ b/cmake/FindSODIUM.cmake
@@ -0,0 +1,15 @@
+# Find SODIUM
+#
+# SODIUM_INCLUDE_DIR
+# SODIUM_LIBRARY
+# SODIUM_FOUND
+#
+
+FIND_PATH(SODIUM_INCLUDE_DIR NAMES sodium.h)
+
+FIND_LIBRARY(SODIUM_LIBRARY NAMES sodium)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SODIUM DEFAULT_MSG SODIUM_LIBRARY SODIUM_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(SODIUM_INCLUDE_DIR SODIUM_LIBRARY)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 420308d8..44ae980c 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -3,6 +3,8 @@ project(core C)
 
 if(WIN32)
         include_directories(${CMAKE_HOME_DIRECTORY}/sodium/include/)
+else(WIN32)
+        include_directories(${SODIUM_INCLUDE_DIR})
 endif()
 
 set(core_sources
diff --git a/core/friend_requests.h b/core/friend_requests.h
index e38f7edc..4dfc5130 100644
--- a/core/friend_requests.h
+++ b/core/friend_requests.h
@@ -48,4 +48,4 @@ int friendreq_handlepacket(uint8_t *packet, uint32_t length, IP_Port source);
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/other/bootstrap_serverdaemon/CMakeLists.txt b/other/bootstrap_serverdaemon/CMakeLists.txt
index f675396d..512179f3 100644
--- a/other/bootstrap_serverdaemon/CMakeLists.txt
+++ b/other/bootstrap_serverdaemon/CMakeLists.txt
@@ -3,11 +3,15 @@ project(DHT_bootstrap_daemon C)
 
 set(exe_name DHT_bootstrap_daemon)
 
+find_package(LIBCONFIG REQUIRED)
+
+include_directories(${LIBCONFIG_INCLUDE_DIR})
+
 add_executable(${exe_name}
         DHT_bootstrap_daemon.c)
 
 target_link_libraries(${exe_name}
-        config)
+        ${LIBCONFIG_LIBRARY})
 
 linkCoreLibraries(${exe_name})
 
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index a215463d..588450e2 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -87,7 +87,7 @@ void print_friendlist()
         for(i = 0; i < 4; i++) {
             printf("ClientID: ");
             for(j = 0; j < 32; j++) {
-                if(0 <= friends_list[k].client_list[i].client_id[j] && friends_list[k].client_list[i].client_id[j] < 16)
+                if(friends_list[k].client_list[i].client_id[j] < 16)
                     printf("0");
                 printf("%hhX", friends_list[k].client_list[i].client_id[j]);
             }
diff --git a/testing/Lossless_UDP_testclient.c b/testing/Lossless_UDP_testclient.c
index c1eaa69d..b96756ab 100644
--- a/testing/Lossless_UDP_testclient.c
+++ b/testing/Lossless_UDP_testclient.c
@@ -211,4 +211,4 @@ int main(int argc, char *argv[])
     }
         
     return 0;
-}
\ No newline at end of file
+}
diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c
index 4b437f0e..29b0ade5 100644
--- a/testing/Lossless_UDP_testserver.c
+++ b/testing/Lossless_UDP_testserver.c
@@ -198,4 +198,4 @@ int main(int argc, char *argv[])
     }
         
     return 0;
-}
\ No newline at end of file
+}
diff --git a/testing/misc_tools.h b/testing/misc_tools.h
index 29b37ce5..5079e15d 100644
--- a/testing/misc_tools.h
+++ b/testing/misc_tools.h
@@ -26,4 +26,4 @@
 
 unsigned char * hex_string_to_bin(char hex_string[]);
  
-#endif // MISC_TOOLS_H
\ No newline at end of file
+#endif // MISC_TOOLS_H