summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2013-08-16 03:36:12 -0700
committerirungentoo <irungentoo@gmail.com>2013-08-16 03:36:12 -0700
commit03d69140e999a7a23e060e5a834cecf89d60a700 (patch)
treec04777b22f91db42439af168f02f87272b1156ca
parentadd81b3426d661127c43fd80972f324cb684cae0 (diff)
parent487c7d27d504ae248b600d56b76b7b9074e40ebe (diff)
Merge pull request #472 from naxuroqa/master
Build fails when SHARED_TOXCORE flag is set in cmake
-rwxr-xr-xCMakeLists.txt2
-rw-r--r--cmake/FindSODIUM.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86b5d27b..815616a7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ else()
34 34
35 include_directories(${SODIUM_INCLUDE_DIR}) 35 include_directories(${SODIUM_INCLUDE_DIR})
36 36
37 set(LINK_CRYPTO_LIBRARY ${SODIUM_LIBRARY}) 37 set(LINK_CRYPTO_LIBRARY ${SODIUM_LIBRARIES})
38endif() 38endif()
39 39
40#MinGW prints more warnings for -Wall than gcc does, thus causing build to fail 40#MinGW prints more warnings for -Wall than gcc does, thus causing build to fail
diff --git a/cmake/FindSODIUM.cmake b/cmake/FindSODIUM.cmake
index 2db0f667..6b0c2f23 100644
--- a/cmake/FindSODIUM.cmake
+++ b/cmake/FindSODIUM.cmake
@@ -54,8 +54,8 @@ endif()
54 54
55find_library(SODIUM_LIBRARY 55find_library(SODIUM_LIBRARY
56 NAMES 56 NAMES
57 ${WIN32_LIBSODIUM_FILENAME}
58 sodium 57 sodium
58 ${WIN32_LIBSODIUM_FILENAME}
59 PATHS 59 PATHS
60 ${SODIUM_ROOT_DIR}/lib 60 ${SODIUM_ROOT_DIR}/lib
61) 61)