3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1874 from hintjens/master

Browse Source 
Tweaks to building libzmq
This commit is contained in:
Luca Boccassi 2016-03-30 13:34:40 +01:00
commit d6354c64ea
8 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -43,7 +43,7 @@ elseif (WITH_LIBSODIUM)
if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS") if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
target_link_libraries (libzmq ssp) target_link_libraries (libzmq ssp)
endif () endif ()
set (HAVE_LIBSODIUM 1) set (ZMQ_USE_LIBSODIUM 1)
set (ZMQ_HAVE_CURVE 1) set (ZMQ_HAVE_CURVE 1)
else () else ()
message (FATAL_ERROR message (FATAL_ERROR

13
builds/msvc/readme.txt
View File

@ -1,3 +1,11 @@
For building on Windows, use:
./configure.bat
cd build
./buildall.bat
This requires that the CMD.EXE be created using the DevStudio Tools link to create a CMD.EXE windo.
Visual Studio product and C++ compiler Versions: Visual Studio product and C++ compiler Versions:
Visual C++ 2008 => Visual C++ 9 Visual C++ 2008 => Visual C++ 9
@ -14,11 +22,6 @@ More info here:
http://en.wikipedia.org/wiki/Visual_C%2B%2B http://en.wikipedia.org/wiki/Visual_C%2B%2B
For building Windows, use the buildall.bat script in this directory.
It requires that the CMD.EXE be created using the DevStudio Tools link to create a CMD.EXE windo.
If multiple DevStudio versions are installed on the machine, you can run buildall.bat on separate windows that each were created by the desired DevStudio target. If multiple DevStudio versions are installed on the machine, you can run buildall.bat on separate windows that each were created by the desired DevStudio target.
If you prefer to build all versions (or several) at the same time, you should uncomment the specific version desired in buildall.bat to build them from a single window. If you prefer to build all versions (or several) at the same time, you should uncomment the specific version desired in buildall.bat to build them from a single window.

2
builds/msvc/vs2015/build.bat
View File

@ -1,2 +0,0 @@
@ECHO OFF
call ../build/buildbase.bat ..\vs2015\mysolution.sln 14

2
configure.ac
View File

@ -439,7 +439,7 @@ if test "x$enable_curve" = "xno"; then
elif test "x$with_libsodium" = "xyes"; then elif test "x$with_libsodium" = "xyes"; then
AC_MSG_NOTICE([Using libsodium for CURVE security]) AC_MSG_NOTICE([Using libsodium for CURVE security])
AC_DEFINE(ZMQ_HAVE_CURVE, [1], [Using curve encryption]) AC_DEFINE(ZMQ_HAVE_CURVE, [1], [Using curve encryption])
AC_DEFINE(HAVE_LIBSODIUM, [1], [Using libsodium for curve encryption]) AC_DEFINE(ZMQ_USE_LIBSODIUM, [1], [Using libsodium for curve encryption])
curve_library="libsodium" curve_library="libsodium"
# On Solaris, libsodium depends on libssp # On Solaris, libsodium depends on libssp

2
src/ctx.cpp
View File

@ -51,7 +51,7 @@
#if defined (ZMQ_USE_TWEETNACL) #if defined (ZMQ_USE_TWEETNACL)
# include "tweetnacl.h" # include "tweetnacl.h"
#elif defined (HAVE_LIBSODIUM) #elif defined (ZMQ_USE_LIBSODIUM)
# include "sodium.h" # include "sodium.h"
#endif #endif

2
src/curve_client.hpp
View File

@ -36,7 +36,7 @@
#if defined (ZMQ_USE_TWEETNACL) #if defined (ZMQ_USE_TWEETNACL)
# include "tweetnacl.h" # include "tweetnacl.h"
#elif defined (HAVE_LIBSODIUM) #elif defined (ZMQ_USE_LIBSODIUM)
# include "sodium.h" # include "sodium.h"
#endif #endif

2
src/curve_server.hpp
View File

@ -36,7 +36,7 @@
#if defined (ZMQ_USE_TWEETNACL) #if defined (ZMQ_USE_TWEETNACL)
# include "tweetnacl.h" # include "tweetnacl.h"
#elif defined (HAVE_LIBSODIUM) #elif defined (ZMQ_USE_LIBSODIUM)
# include "sodium.h" # include "sodium.h"
#endif #endif

2
src/zmq_utils.cpp
View File

@ -46,7 +46,7 @@
#if defined (ZMQ_USE_TWEETNACL) #if defined (ZMQ_USE_TWEETNACL)
# include "tweetnacl.h" # include "tweetnacl.h"
#elif defined (HAVE_LIBSODIUM) #elif defined (ZMQ_USE_LIBSODIUM)
# include "sodium.h" # include "sodium.h"
#endif #endif