From 8768ac9c67665c6270c6c8058be2bf2507203da8 Mon Sep 17 00:00:00 2001 From: Rinat Ibragimov Date: Sat, 17 Mar 2018 01:31:55 +0300 Subject: [PATCH] simplify inclusion as a subproject --- CMakeLists.txt | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc736c4..0b0f054 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ set (CMAKE_CXX_STANDARD 11) # ------------------------------------------------------------------------------------------------------ # 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. # if variable SRCS does not yet exist, it is created. @@ -69,7 +69,7 @@ endif() # ------------------------------------------------------------------------------------------------------ # 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) # create shared lib diff --git a/README.md b/README.md index 390d06b..b908357 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,7 @@ On Windows you are required to define `NOMINMAX` when compiling code that includ ## Using 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 +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 would be: