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

Merge pull request #201 from i-rinat/master 

Simplify inclusion as a subproject
This commit is contained in:
Emiel Bruijntjes 2018-03-17 20:16:38 +01:00 committed by GitHub
parent 58d51a74ef 8768ac9c67
commit 49491e177a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -27,7 +27,7 @@ set (CMAKE_CXX_STANDARD 11)
# ------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------
# set include/ as include directory # set include/ as include directory
include_directories(${CMAKE_SOURCE_DIR}/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
# macro that adds a list of provided source files to a list called SRCS. # macro that adds a list of provided source files to a list called SRCS.
# if variable SRCS does not yet exist, it is created. # if variable SRCS does not yet exist, it is created.
@ -69,7 +69,7 @@ endif()
# ------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------
# set output directory # set output directory
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin) set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin)
if(AMQP-CPP_BUILD_SHARED) if(AMQP-CPP_BUILD_SHARED)
# create shared lib # create shared lib

2
README.md
View File

@ -85,7 +85,7 @@ On Windows you are required to define `NOMINMAX` when compiling code that includ
## Using cmake ## Using cmake
The CMake file supports both building and installing. You can choose not to use 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 the install functionality, and instead manually use the build output at `build/bin/`. Keep
in mind that the TCP module is only supported for Linux. An example install method in mind that the TCP module is only supported for Linux. An example install method
would be: would be: