cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake find module fixes for static linking: (#621)

Browse Source 
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.
This commit is contained in:
Michael Ellery 2017-10-27 13:01:20 -07:00 committed by Frank Denis
parent 68d8e33a55
commit 5dcf78a14c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/Findsodium.cmake
View File

@ -32,7 +32,9 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU"
endif() endif()
# static library option # static library option
option(sodium_USE_STATIC_LIBS "enable to statically link against sodium") if (NOT DEFINED sodium_USE_STATIC_LIBS)
option(sodium_USE_STATIC_LIBS "enable to statically link against sodium" OFF)
endif()
if(NOT (sodium_USE_STATIC_LIBS EQUAL sodium_USE_STATIC_LIBS_LAST)) if(NOT (sodium_USE_STATIC_LIBS EQUAL sodium_USE_STATIC_LIBS_LAST))
unset(sodium_LIBRARY CACHE) unset(sodium_LIBRARY CACHE)
unset(sodium_LIBRARY_DEBUG CACHE) unset(sodium_LIBRARY_DEBUG CACHE)
@ -53,6 +55,11 @@ if (UNIX)
endif() endif()
if(sodium_USE_STATIC_LIBS) if(sodium_USE_STATIC_LIBS)
# if pkgconfig for libsodium doesn't provide
# static lib info, then override PKG_STATIC here..
if (NOT DEFINED sodium_PKG_STATIC_LIBRARIES)
set(sodium_PKG_STATIC_LIBRARIES libsodium.a)
endif()
set(XPREFIX sodium_PKG_STATIC) set(XPREFIX sodium_PKG_STATIC)
else() else()
set(XPREFIX sodium_PKG) set(XPREFIX sodium_PKG)