From 96245dd3b46f6689b4d537f29794992009646ce2 Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <github@benoitblanchon.fr>
Date: Thu, 19 Nov 2015 21:53:27 +0100
Subject: [PATCH] Made library easier to use from a CMake project: simply
 add_subdirectory(ArduinoJson/src)

---
 .travis.yml         | 3 +++
 CHANGELOG.md        | 5 +++++
 CMakeLists.txt      | 6 +-----
 src/CMakeLists.txt  | 8 ++++++++
 test/CMakeLists.txt | 3 ---
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a8a3300d..0876c2d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@ compiler:
   - clang
 before_install:
   - pip install --user cpp-coveralls
+  - mkdir -p /tmp/cmake
+  - curl https://cmake.org/files/v3.4/cmake-3.4.0-Linux-x86_64.tar.gz | tar xz -C /tmp/cmake --strip 1
+  - export PATH=/tmp/cmake/bin:$PATH
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16"
   - sleep 3
   - export DISPLAY=:1.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f36591ba..e2c659b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 ArduinoJson: change log
 =======================
 
+HEAD
+----
+
+* Made library easier to use from a CMake project: simply add_subdirectory(ArduinoJson/src)
+
 v5.0.6
 ------
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f95d493..a1d64212 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.4)
+cmake_minimum_required(VERSION 2.8.12)
 project(ArduinoJson)
 
 enable_testing()
@@ -7,10 +7,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 
-if(MSVC)
-	add_definitions(-D_CRT_SECURE_NO_WARNINGS -W4)
-endif()
-
 if(${COVERAGE})
 	set(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 49346a9e..a7c1e637 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,4 +48,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 	)
 endif()
 
+if(MSVC)
+	add_definitions(
+		-D_CRT_SECURE_NO_WARNINGS
+		-W4)
+endif()
+
 add_library(ArduinoJson ${CPP_FILES} ${HPP_FILES} ${IPP_FILES})
+
+target_include_directories(ArduinoJson INTERFACE ${CMAKE_CURRENT_LIST_DIR}/../include)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c09910e4..5e447690 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,10 +1,8 @@
 set(GTEST_DIR ../third-party/gtest-1.7.0)
 
-file(GLOB_RECURSE INC_FILES ../include/*.h)
 file(GLOB TESTS_FILES *.hpp *.cpp)
 
 include_directories(
-	../include
     ${GTEST_DIR}
     ${GTEST_DIR}/include)
 
@@ -17,7 +15,6 @@ endif()
 
 add_executable(ArduinoJsonTests 
     ${TESTS_FILES}
-	${INC_FILES}
     ${GTEST_DIR}/src/gtest-all.cc
     ${GTEST_DIR}/src/gtest_main.cc)