diff options
author | irungentoo <irungentoo@gmail.com> | 2013-08-04 18:26:04 -0700 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-08-04 18:26:04 -0700 |
commit | c1e4365d1d39876f5cb088d7850ae6a3b53d9833 (patch) | |
tree | c4fc26c796dba87028f8d91c4d8df9e029d295d5 /cmake | |
parent | f6207efef1cf94b6373a5c55cc654deafe63459a (diff) | |
parent | f03dc44e97e993024e42b3a0915de6401d9cecb0 (diff) |
Merge pull request #330 from nurupo/master
Fixed Windows build
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/FindSODIUM.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/FindSODIUM.cmake b/cmake/FindSODIUM.cmake index fd6206ff..ff9bc27b 100644 --- a/cmake/FindSODIUM.cmake +++ b/cmake/FindSODIUM.cmake | |||
@@ -26,11 +26,12 @@ set(_SODIUM_ROOT_HINTS | |||
26 | 26 | ||
27 | set(_SODIUM_ROOT_PATHS | 27 | set(_SODIUM_ROOT_PATHS |
28 | "$ENV{PROGRAMFILES}/sodium" | 28 | "$ENV{PROGRAMFILES}/sodium" |
29 | "${CMAKE_SOURCE_DIR}/sodium" | ||
29 | ) | 30 | ) |
30 | 31 | ||
31 | find_path(SODIUM_ROOT_DIR | 32 | find_path(SODIUM_ROOT_DIR |
32 | NAMES | 33 | NAMES |
33 | include/cmocka.h | 34 | include/sodium.h |
34 | HINTS | 35 | HINTS |
35 | ${_SODIUM_ROOT_HINTS} | 36 | ${_SODIUM_ROOT_HINTS} |
36 | PATHS | 37 | PATHS |
@@ -48,6 +49,7 @@ find_path(SODIUM_INCLUDE_DIR | |||
48 | find_library(SODIUM_LIBRARY | 49 | find_library(SODIUM_LIBRARY |
49 | NAMES | 50 | NAMES |
50 | sodium | 51 | sodium |
52 | libsodium.a | ||
51 | PATHS | 53 | PATHS |
52 | ${SODIUM_ROOT_DIR}/lib | 54 | ${SODIUM_ROOT_DIR}/lib |
53 | ) | 55 | ) |