From 9c57f3e172bd9e758ce3f349cbc09c4683dd4efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20Hauser?= Date: Fri, 5 Oct 2018 23:32:01 +0200 Subject: [PATCH] Fix odd #include, remove dangling newline, alter readme to match proposal --- CMakeLists.txt | 3 +-- README.md | 9 +++++---- .../fluent/operators/collections/collectionoperator.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b524794..39b6fdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(include/snowhouse) +project(snowhouse) option(SNOWHOUSE_BUILD_TESTS "Build the Snowhouse tests" OFF) option(SNOWHOUSE_RUN_TESTS "Run the Snowhouse tests" OFF) @@ -63,4 +63,3 @@ if (SNOWHOUSE_BUILD_TESTS AND SNOWHOUSE_RUN_TESTS) elseif (SNOWHOUSE_RUN_TESTS) message(WARNING "Unable to run snowhouse tests - set:\n option(SNOWHOUSE_BUILD_TESTS, \"Build the Snowhouse tests\" ON)\nand clear your CMakeCache.txt") endif() - diff --git a/README.md b/README.md index 2a26d99..1b23c7f 100644 --- a/README.md +++ b/README.md @@ -16,16 +16,17 @@ git submodule add -b headers-only https://github.com/banditcpp/snowhouse snowhou git submodule update --init --recursive ``` -CMake (>= 3.0) users can use the provided library target: -```CMake -shell$ git clone https://github.com/banditcpp/snowhouse.git +As an alternative, CMake >= 3.0 users can use Snowhouse with the provided library target. +Assuming you have cloned the `master` branch into a `snowhouse` subdirectory, +your `CMakeLists.txt` might contain lines like the following: -# CMakeLists.txt +```cmake add_subdirectory(snowhouse) add_executable(app main.cpp) target_link_libraries(app snowhouse) ``` + ## Usage ```C++ diff --git a/include/snowhouse/fluent/operators/collections/collectionoperator.h b/include/snowhouse/fluent/operators/collections/collectionoperator.h index 80a80e6..a2f787b 100644 --- a/include/snowhouse/fluent/operators/collections/collectionoperator.h +++ b/include/snowhouse/fluent/operators/collections/collectionoperator.h @@ -6,7 +6,7 @@ #ifndef SNOWHOUSE_COLLECTIONOPERATOR_H #define SNOWHOUSE_COLLECTIONOPERATOR_H -#include "../../operators/constraintoperator.h" +#include "../constraintoperator.h" namespace snowhouse {