From: Stephen Seo <seo.disparate@gmail.com>
Date: Thu, 16 Jan 2020 02:30:22 +0000 (+0900)
Subject: Distinguish manual variables and pkgconf variables
X-Git-Tag: 1.0~74
X-Git-Url: https://git.seodisparate.com/gitweb?a=commitdiff_plain;h=80e67e845c8700472b38a5656c9329e85dbf9c2b;p=UDPConnection

Distinguish manual variables and pkgconf variables

Variables checked to manually set libsodium paths have been changed to
prevent conflict with variables set by searching for libsodium via
pkgconfig.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 416a272..ae2a2c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,11 +36,11 @@ endif()
 
 if(UDPC_DISABLE_LIBSODIUM)
     message(STATUS "libsodium disabled")
-elseif(DEFINED LIBSODIUM_LIBRARIES AND DEFINED LIBSODIUM_INCLUDE_DIRS)
+elseif(DEFINED M_LIBSODIUM_LIBRARIES AND DEFINED M_LIBSODIUM_INCLUDE_DIRS)
     message(STATUS "libsodium manual paths detected, using them")
     target_compile_definitions(UDPC PUBLIC UDPC_LIBSODIUM_ENABLED)
-    target_link_libraries(UDPC PUBLIC ${LIBSODIUM_LIBRARIES})
-    target_include_directories(UDPC PUBLIC ${LIBSODIUM_INCLUDE_DIRS})
+    target_link_libraries(UDPC PUBLIC ${M_LIBSODIUM_LIBRARIES})
+    target_include_directories(UDPC PUBLIC ${M_LIBSODIUM_INCLUDE_DIRS})
 else()
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(LIBSODIUM QUIET libsodium)