jessequ
/
AMQP-CPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'clean-build' of https://github.com/surgura/AMQP-CPP into clean-build

This commit is contained in:
Aart Stuurman 2018-01-29 17:12:29 +01:00
parent 0995b3e0ec 51ee133117
commit 343cbfdff8
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -2,11 +2,11 @@
# #
# Options: # Options:
# #
# - BUILD_SHARED (default OFF) # - AMQP-CPP_BUILD_SHARED (default OFF)
# ON: Build shared lib # ON: Build shared lib
# OFF: Build static lib # OFF: Build static lib
# #
# - LINUX_TCP (default OFF) # - AMQP-CPP_LINUX_TCP (default OFF)
# ON: Build posix handler implementation # ON: Build posix handler implementation
# OFF: Don't build posix handler implementation # OFF: Don't build posix handler implementation
@ -94,4 +94,4 @@ endif()
# copy header files # copy header files
install(DIRECTORY include/amqpcpp/ DESTINATION include/amqpcpp install(DIRECTORY include/amqpcpp/ DESTINATION include/amqpcpp
FILES_MATCHING PATTERN "*.h") FILES_MATCHING PATTERN "*.h")
install(FILES include/amqpcpp.h DESTINATION include) install(FILES include/amqpcpp.h DESTINATION include)

8
README.md
View File

@ -62,15 +62,19 @@ Then check out our other commercial and open source solutions:
INSTALLING INSTALLING
========== ==========
AMQP-CPP comes with an optional Linux-only TCP module that takes care of the network part required for the AMQP-CPP core library. AMQP-CPP comes with an optional Linux-only TCP module that takes care of the network part required for the AMQP-CPP core library. If you use this module, you are required to link with `pthread`.
There are two methods to compile AMQP-CPP: CMake and Make. CMake is platform portable, but the Makefile only works on Linux. After building there are two relevant files to include when using the library. There are two methods to compile AMQP-CPP: CMake and Make. CMake is platform portable, but the Makefile only works on Linux.
After building there are two relevant files to include when using the library.
File|Include when? File|Include when?
----|------------ ----|------------
amqpcpp.h|Always amqpcpp.h|Always
amqpcpp/linux_tcp.h|If using the Linux-only TCP module amqpcpp/linux_tcp.h|If using the Linux-only TCP module
On Windows you are required to define `NOMINMAX` when compiling code that includes public AMQP-CPP header files.
## CMake ## CMake
The CMake file supports both building and installing. You can choose not to use the install functionality, and instead manually use the build output at `bin/`. Keep in mind that the TCP module is only supported for Linux. An example install method would be: The CMake file supports both building and installing. You can choose not to use the install functionality, and instead manually use the build output at `bin/`. Keep in mind that the TCP module is only supported for Linux. An example install method would be:
``` bash ``` bash