From 5cbc09c6806b822b53934725db2c2ed9c016a258 Mon Sep 17 00:00:00 2001 From: Aart Stuurman Date: Mon, 29 Jan 2018 10:45:30 +0100 Subject: [PATCH 1/5] Update CMakeLists.txt --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 911a70d..3c8fddb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,11 +2,11 @@ # # Options: # -# - BUILD_SHARED (default OFF) +# - AMQP-CPP_BUILD_SHARED (default OFF) # ON: Build shared lib # OFF: Build static lib # -# - LINUX_TCP (default OFF) +# - AMQP-CPP_LINUX_TCP (default OFF) # ON: Build posix handler implementation # OFF: Don't build posix handler implementation @@ -94,4 +94,4 @@ endif() # copy header files install(DIRECTORY include/amqpcpp/ DESTINATION include/amqpcpp FILES_MATCHING PATTERN "*.h") -install(FILES include/amqpcpp.h DESTINATION include) \ No newline at end of file +install(FILES include/amqpcpp.h DESTINATION include) From ea70d43034f3a7126c78065a951a447e37409ef2 Mon Sep 17 00:00:00 2001 From: Aart Stuurman Date: Mon, 29 Jan 2018 16:34:22 +0100 Subject: [PATCH 2/5] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 22026a9..88aed6c 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,8 @@ File|Include when? amqpcpp.h|Always 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 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 From 3ea9972cf6e5134fbf6e7696418494a9ccb17db2 Mon Sep 17 00:00:00 2001 From: Aart Stuurman Date: Mon, 29 Jan 2018 16:34:50 +0100 Subject: [PATCH 3/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 88aed6c..6ff9d91 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ File|Include when? amqpcpp.h|Always 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. +On Windows you are required to define `NOMINMAX` when compiling code that includes public AMQP-CPP header files. ## 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: From f76f617c5a275a73cf7f0dda0c279f679b5bf188 Mon Sep 17 00:00:00 2001 From: Aart Stuurman Date: Mon, 29 Jan 2018 16:35:41 +0100 Subject: [PATCH 4/5] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ff9d91..333ec76 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,9 @@ 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. -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? ----|------------ From 51ee13311775aa95c031a5e20a47c1ff92790e5d Mon Sep 17 00:00:00 2001 From: Aart Stuurman Date: Mon, 29 Jan 2018 16:37:57 +0100 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 333ec76..bb9bd5f 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Then check out our other commercial and open source solutions: 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.