Merge pull request #38 from HauserV/master

Make snowhouse a CMake library
banditcpp · Jan 9, 2019 · b25c70f · b25c70f
2 parents 98c8d81 + 5d08afa
commit b25c70f
Show file tree

Hide file tree

Showing 46 changed files with 23 additions and 5 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -6,7 +6,7 @@ environment:
     - CXX_STANDARD: 14
 
 build_script:
- - cmake -G "Visual Studio 14" -DSNOWHOUSE_RUN_TESTS=0 -DSNOWHOUSE_CXX_STANDARD=C++%CXX_STANDARD%
+ - cmake -G "Visual Studio 14" -DSNOWHOUSE_RUN_TESTS=0 -DSNOWHOUSE_BUILD_TESTS=1 -DSNOWHOUSE_CXX_STANDARD=C++%CXX_STANDARD%
  - cmake --build .
 test_script:
  - bin\Debug\snowhouse-tests.exe
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,12 +2,15 @@ cmake_minimum_required(VERSION 2.8)
 
 project(snowhouse)
 
-option(SNOWHOUSE_BUILD_TESTS    "Build the Snowhouse tests"                 ON)
-option(SNOWHOUSE_RUN_TESTS      "Run the Snowhouse tests"                   ON)
+option(SNOWHOUSE_BUILD_TESTS    "Build the Snowhouse tests"                 OFF)
+option(SNOWHOUSE_RUN_TESTS      "Run the Snowhouse tests"                   OFF)
 set(SNOWHOUSE_CXX_STANDARD "C++03" CACHE STRING "The C++ standard the examples are compiled with")
 set_property(CACHE SNOWHOUSE_CXX_STANDARD PROPERTY STRINGS "C++98" "C++03" "C++11" "C++14")
 
-include_directories("${PROJECT_SOURCE_DIR}")
+if (NOT ${CMAKE_VERSION} VERSION_LESS "3.0.0")
+    add_library(snowhouse INTERFACE)
+    target_include_directories(snowhouse INTERFACE include)
+endif()
 
 if(SNOWHOUSE_CXX_STANDARD STREQUAL "C++98")
   set(std_name "c++98")
@@ -45,6 +48,11 @@ message(STATUS "C++ compiler flags: ${CMAKE_CXX_FLAGS}")
 if (SNOWHOUSE_BUILD_TESTS)
     FILE(GLOB SnowhouseSpecSourceFiles example/*.cpp)
     add_executable(snowhouse-tests ${SnowhouseSpecSourceFiles})
+    if (NOT ${CMAKE_VERSION} VERSION_LESS "3.0.0")
+        target_link_libraries(snowhouse-tests PRIVATE snowhouse)
+    else()
+        include_directories("${PROJECT_SOURCE_DIR}/include")
+    endif()
 endif()
 
 if (SNOWHOUSE_BUILD_TESTS AND SNOWHOUSE_RUN_TESTS)

diff --git a/README.md b/README.md
@@ -16,6 +16,16 @@ git submodule add -b headers-only https://github.com/banditcpp/snowhouse snowhou
 git submodule update --init --recursive
 ```
 
+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:
+
+```cmake
+add_subdirectory(snowhouse)
+add_executable(app main.cpp)
+target_link_libraries(app snowhouse)
+```
+
 ## Usage
 
 ```C++

diff --git a/snowhouse/assert.h → include/snowhouse/assert.h b/snowhouse/assert.h → include/snowhouse/assert.h
diff --git a/snowhouse/assertionexception.h → include/snowhouse/assertionexception.h b/snowhouse/assertionexception.h → include/snowhouse/assertionexception.h
diff --git a/snowhouse/constraints/constraints.h → include/snowhouse/constraints/constraints.h b/snowhouse/constraints/constraints.h → include/snowhouse/constraints/constraints.h
diff --git a/snowhouse/constraints/containsconstraint.h → ...nowhouse/constraints/containsconstraint.h b/snowhouse/constraints/containsconstraint.h → ...nowhouse/constraints/containsconstraint.h
diff --git a/snowhouse/constraints/endswithconstraint.h → ...nowhouse/constraints/endswithconstraint.h b/snowhouse/constraints/endswithconstraint.h → ...nowhouse/constraints/endswithconstraint.h
diff --git a/snowhouse/constraints/equalsconstraint.h → .../snowhouse/constraints/equalsconstraint.h b/snowhouse/constraints/equalsconstraint.h → .../snowhouse/constraints/equalsconstraint.h
diff --git a/...e/constraints/equalscontainerconstraint.h → ...e/constraints/equalscontainerconstraint.h b/...e/constraints/equalscontainerconstraint.h → ...e/constraints/equalscontainerconstraint.h
diff --git a/...e/constraints/equalswithdeltaconstraint.h → ...e/constraints/equalswithdeltaconstraint.h b/...e/constraints/equalswithdeltaconstraint.h → ...e/constraints/equalswithdeltaconstraint.h
diff --git a/...e/constraints/expressions/andexpression.h → ...e/constraints/expressions/andexpression.h b/...e/constraints/expressions/andexpression.h → ...e/constraints/expressions/andexpression.h
diff --git a/...ouse/constraints/expressions/expression.h → ...ouse/constraints/expressions/expression.h b/...ouse/constraints/expressions/expression.h → ...ouse/constraints/expressions/expression.h
diff --git a/.../constraints/expressions/expression_fwd.h → .../constraints/expressions/expression_fwd.h b/.../constraints/expressions/expression_fwd.h → .../constraints/expressions/expression_fwd.h
diff --git a/...e/constraints/expressions/notexpression.h → ...e/constraints/expressions/notexpression.h b/...e/constraints/expressions/notexpression.h → ...e/constraints/expressions/notexpression.h
diff --git a/...se/constraints/expressions/orexpression.h → ...se/constraints/expressions/orexpression.h b/...se/constraints/expressions/orexpression.h → ...se/constraints/expressions/orexpression.h
diff --git a/snowhouse/constraints/fulfillsconstraint.h → ...nowhouse/constraints/fulfillsconstraint.h b/snowhouse/constraints/fulfillsconstraint.h → ...nowhouse/constraints/fulfillsconstraint.h
diff --git a/snowhouse/constraints/haslengthconstraint.h → ...owhouse/constraints/haslengthconstraint.h b/snowhouse/constraints/haslengthconstraint.h → ...owhouse/constraints/haslengthconstraint.h
diff --git a/snowhouse/constraints/isemptyconstraint.h → ...snowhouse/constraints/isemptyconstraint.h b/snowhouse/constraints/isemptyconstraint.h → ...snowhouse/constraints/isemptyconstraint.h
diff --git a/...use/constraints/isgreaterthanconstraint.h → ...use/constraints/isgreaterthanconstraint.h b/...use/constraints/isgreaterthanconstraint.h → ...use/constraints/isgreaterthanconstraint.h
diff --git a/...raints/isgreaterthanorequaltoconstraint.h → ...raints/isgreaterthanorequaltoconstraint.h b/...raints/isgreaterthanorequaltoconstraint.h → ...raints/isgreaterthanorequaltoconstraint.h
diff --git a/snowhouse/constraints/islessthanconstraint.h → ...whouse/constraints/islessthanconstraint.h b/snowhouse/constraints/islessthanconstraint.h → ...whouse/constraints/islessthanconstraint.h
diff --git a/...nstraints/islessthanorequaltoconstraint.h → ...nstraints/islessthanorequaltoconstraint.h b/...nstraints/islessthanorequaltoconstraint.h → ...nstraints/islessthanorequaltoconstraint.h
diff --git a/snowhouse/constraints/startswithconstraint.h → ...whouse/constraints/startswithconstraint.h b/snowhouse/constraints/startswithconstraint.h → ...whouse/constraints/startswithconstraint.h
diff --git a/snowhouse/exceptions.h → include/snowhouse/exceptions.h b/snowhouse/exceptions.h → include/snowhouse/exceptions.h
diff --git a/snowhouse/fluent/constraintadapter.h → include/snowhouse/fluent/constraintadapter.h b/snowhouse/fluent/constraintadapter.h → include/snowhouse/fluent/constraintadapter.h
diff --git a/snowhouse/fluent/constraintlist.h → include/snowhouse/fluent/constraintlist.h b/snowhouse/fluent/constraintlist.h → include/snowhouse/fluent/constraintlist.h
diff --git a/snowhouse/fluent/expressionbuilder.h → include/snowhouse/fluent/expressionbuilder.h b/snowhouse/fluent/expressionbuilder.h → include/snowhouse/fluent/expressionbuilder.h
diff --git a/snowhouse/fluent/fluent.h → include/snowhouse/fluent/fluent.h b/snowhouse/fluent/fluent.h → include/snowhouse/fluent/fluent.h
diff --git a/snowhouse/fluent/operators/andoperator.h → .../snowhouse/fluent/operators/andoperator.h b/snowhouse/fluent/operators/andoperator.h → .../snowhouse/fluent/operators/andoperator.h
diff --git a/...luent/operators/collections/alloperator.h → ...luent/operators/collections/alloperator.h b/...luent/operators/collections/alloperator.h → ...luent/operators/collections/alloperator.h
diff --git a/...t/operators/collections/atleastoperator.h → ...t/operators/collections/atleastoperator.h b/...t/operators/collections/atleastoperator.h → ...t/operators/collections/atleastoperator.h
diff --git a/...nt/operators/collections/atmostoperator.h → ...nt/operators/collections/atmostoperator.h b/...nt/operators/collections/atmostoperator.h → ...nt/operators/collections/atmostoperator.h
diff --git a/...llections/collectionconstraintevaluator.h → ...llections/collectionconstraintevaluator.h b/...llections/collectionconstraintevaluator.h → ...llections/collectionconstraintevaluator.h
diff --git a/...perators/collections/collectionoperator.h → ...perators/collections/collectionoperator.h b/...perators/collections/collectionoperator.h → ...perators/collections/collectionoperator.h
diff --git a/...t/operators/collections/exactlyoperator.h → ...t/operators/collections/exactlyoperator.h b/...t/operators/collections/exactlyoperator.h → ...t/operators/collections/exactlyoperator.h
diff --git a/...uent/operators/collections/noneoperator.h → ...uent/operators/collections/noneoperator.h b/...uent/operators/collections/noneoperator.h → ...uent/operators/collections/noneoperator.h
diff --git a/...use/fluent/operators/constraintoperator.h → ...use/fluent/operators/constraintoperator.h b/...use/fluent/operators/constraintoperator.h → ...use/fluent/operators/constraintoperator.h
diff --git a/...nt/operators/invalidexpressionexception.h → ...nt/operators/invalidexpressionexception.h b/...nt/operators/invalidexpressionexception.h → ...nt/operators/invalidexpressionexception.h
diff --git a/snowhouse/fluent/operators/notoperator.h → .../snowhouse/fluent/operators/notoperator.h b/snowhouse/fluent/operators/notoperator.h → .../snowhouse/fluent/operators/notoperator.h
diff --git a/snowhouse/fluent/operators/oroperator.h → ...e/snowhouse/fluent/operators/oroperator.h b/snowhouse/fluent/operators/oroperator.h → ...e/snowhouse/fluent/operators/oroperator.h
diff --git a/snowhouse/macros.h → include/snowhouse/macros.h b/snowhouse/macros.h → include/snowhouse/macros.h
diff --git a/snowhouse/snowhouse.h → include/snowhouse/snowhouse.h b/snowhouse/snowhouse.h → include/snowhouse/snowhouse.h
diff --git a/snowhouse/stringize.h → include/snowhouse/stringize.h b/snowhouse/stringize.h → include/snowhouse/stringize.h
diff --git a/snowhouse/stringizers.h → include/snowhouse/stringizers.h b/snowhouse/stringizers.h → include/snowhouse/stringizers.h
diff --git a/util/build.sh b/util/build.sh
@@ -28,5 +28,5 @@ echo " * build path: $buildpath"
 
 mkdir -p "$SRCDIR/$buildpath"
 cd "$SRCDIR/$buildpath" || exit
-cmake -D"SNOWHOUSE_CXX_STANDARD=C++$cxxstandard" "$SRCDIR" || exit
+cmake -DSNOWHOUSE_BUILD_TESTS=1 -DSNOWHOUSE_RUN_TESTS=1 -D"SNOWHOUSE_CXX_STANDARD=C++$cxxstandard" "$SRCDIR" || exit
 cmake --build . || exit