From 80e67e845c8700472b38a5656c9329e85dbf9c2b Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Thu, 16 Jan 2020 11:30:22 +0900 Subject: [PATCH] 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. --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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)