1
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-20 02:25:14 -07:00
Commit Graph

16 Commits

Author SHA1 Message Date
Frank Denis
3f27018394 Indent 2019-07-23 22:29:52 +02:00
Frank Denis
2bf56d7ebd Fix Findsodium.cmake SODIUM_VERSION_STRING regex 2019-06-01 10:31:44 +02:00
Frank Denis
330d13067a
Merge branch 'master' into cmake-fix-version-checking 2019-05-11 13:28:23 +02:00
Frank Denis
fdbfdf5089 cmake-format 2019-05-11 12:13:08 +02:00
dsc
95a1f7d626
Fix Sodium version detection in CMake recipe 2019-05-11 03:50:27 +02:00
SlavSlavov
4f8e068b67
Update Findsodium.cmake
A STREQUAL was left during the previous fix. Removed now.
2018-09-27 22:31:40 +01:00
SlavSlavov
595ef91557
Update Findsodium.cmake
When libsodium is build and installed from source, the line:
list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
generates an error because sodium_PKG_STATIC_LIBRARIES is empty
The proposed change fixes this issue
2018-09-26 20:59:59 +01:00
Henrik Gaßmann
06739323d5 [CMAKE] Fix static library detection on unix (#642)
Manually prepend `lib` and append `.a` to the static library names
provided by the cmake pkg-config cmake module. This is necessary because
the `find_library()` function always prefers the shared object file if
the library name is "unqualified" and unfortunately the cmake pkg-config
module seems to provide only "unqualified" library names through
`*_PKG_STATIC_LIBIRARIES`.
2017-12-05 16:42:34 +00:00
Michael Ellery
5dcf78a14c CMake find module fixes for static linking: (#621)
Enclose option() declaration in a defined check to allow simple caller
set() use case. Provide default static lib name for find_library since
pkgconfig for libsodium currently does not provide it.
2017-10-27 22:01:20 +02:00
Henrik Gaßmann
29914ec821 [Findsodium.cmake] DON'T OVERWRITE LIBRARY SUFFIXES (#576) 2017-08-02 16:32:31 +02:00
ka7
21174cddc3 Feature/spelling (#495)
* spelling fixes (comments only)

* spelling fixes (comments only)
2017-02-25 14:21:10 +01:00
Henrik Gaßmann
a81cea2366 FindSodium.cmake MAKE VS FOLDER SELECTION GENERIC (#471) 2017-01-15 14:12:57 +01:00
Frank Denis
43821d7756 Update the Makefile after the FindSodium.cmake renaming 2017-01-11 09:41:11 -08:00
Henrik Gaßmann
9eeaffe934 RENAME FindSodium.cmake TO Findsodium.cmake (#473)
Fixes jedisct1/libsodium#466
2017-01-11 09:40:51 -08:00
Frank Denis
3203811ee2 Trim spaces 2016-10-05 15:42:02 +02:00
Frank Denis
b1f56de00b Import contrib/FindSodium.cmake 2016-10-05 15:37:03 +02:00