From f510166ac8f326bbe13b8d33b4be97392ccf64af Mon Sep 17 00:00:00 2001
From: Egor Pugin <egor.pugin@gmail.com>
Date: Wed, 31 Jan 2018 17:48:38 +0300
Subject: [PATCH 1/4] Load date library from date dir (since date v2.3).

---
 include/sqlpp11/chrono.h                       | 2 +-
 include/sqlpp11/data_types/day_point/operand.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/sqlpp11/chrono.h b/include/sqlpp11/chrono.h
index 157f51eb..10c03c7c 100644
--- a/include/sqlpp11/chrono.h
+++ b/include/sqlpp11/chrono.h
@@ -27,7 +27,7 @@
 #ifndef SQLPP11_CHRONO_H
 #define SQLPP11_CHRONO_H
 
-#include <date.h>
+#include <date/date.h>
 
 namespace sqlpp
 {
diff --git a/include/sqlpp11/data_types/day_point/operand.h b/include/sqlpp11/data_types/day_point/operand.h
index cfcaf957..28b592b6 100644
--- a/include/sqlpp11/data_types/day_point/operand.h
+++ b/include/sqlpp11/data_types/day_point/operand.h
@@ -27,7 +27,7 @@
 #ifndef SQLPP11_DATA_TYPES_DAY_POINT_OPERAND_H
 #define SQLPP11_DATA_TYPES_DAY_POINT_OPERAND_H
 
-#include <date.h>
+#include <date/date.h>
 #include <sqlpp11/chrono.h>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/alias_operators.h>

From f00cac9599fd812331adbcb3fc5f539ce922d37d Mon Sep 17 00:00:00 2001
From: Egor Pugin <egor.pugin@gmail.com>
Date: Wed, 31 Jan 2018 17:55:02 +0300
Subject: [PATCH 2/4] Update CI scripts.

---
 .appveyor.yml | 5 ++++-
 .travis.yml   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index adadfdb7..9ce93e6a 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,7 +16,10 @@ build_script:
   - CD
   - cd ..
   - CD
-  - git clone --branch v1.0.0 --depth 1 https://github.com/HowardHinnant/date
+  - git clone https://github.com/HowardHinnant/date
+  - cd date
+  - git checkout tags/v2.4
+  - cd ..
   - cd sqlpp11
   - CD
   - echo %configuration%
diff --git a/.travis.yml b/.travis.yml
index 222c4842..f94d0e1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ install:
   - cmake --version
   - git clone https://github.com/HowardHinnant/date
   - cd date
-  - git checkout tags/v1.0.0
+  - git checkout tags/v2.4
   - cd ..
 
 before_script:

From 83c9a6393dc63cdb5b081254f8de58eb7a643666 Mon Sep 17 00:00:00 2001
From: Egor Pugin <egor.pugin@gmail.com>
Date: Wed, 31 Jan 2018 18:22:17 +0300
Subject: [PATCH 3/4] Update FindHinnantDate.cmake script.

---
 cmake/Modules/FindHinnantDate.cmake | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/cmake/Modules/FindHinnantDate.cmake b/cmake/Modules/FindHinnantDate.cmake
index affb0a38..44e90e2a 100644
--- a/cmake/Modules/FindHinnantDate.cmake
+++ b/cmake/Modules/FindHinnantDate.cmake
@@ -13,7 +13,7 @@
 #
 # and the following imported targets::
 #
-#   HinnantDate::Date   - The target to use date.h
+#   HinnantDate::Date   - The target to use date/date.h
 #
 # You can set HinnantDate_ROOT_DIR as hint to the location of the library.
 #
@@ -53,7 +53,7 @@ set(HinnantDate_NOT_FOUND_MESSAGE "Could NOT find HinnantDate.
 Maybe you need to adjust the search paths or HinnantDate_ROOT_DIR.")
 
 find_file(HinnantDate_INCLUDE_FILE
-    date.h date/date.h include/date/date.h
+    date/date.h include/date/date.h
     HINTS
       ${HinnantDate_ROOT_DIR}
       ${HinnantDate_ROOT_DIR}/include
@@ -72,7 +72,10 @@ if (HinnantDate_INCLUDE_FILE)
         unset(HinnantDate_INCLUDE_FILE CACHE)
     else()
         # Check succeeded, create target
-        get_filename_component(HinnantDate_INCLUDE_DIR "${HinnantDate_INCLUDE_FILE}" DIRECTORY CACHE)
+        # remove filename
+        get_filename_component(HinnantDate_INCLUDE_DIR "${HinnantDate_INCLUDE_FILE}" DIRECTORY)
+        # remove date dir
+        get_filename_component(HinnantDate_INCLUDE_DIR "${HinnantDate_INCLUDE_DIR}" DIRECTORY)
         mark_as_advanced(HinnantDate_INCLUDE_DIR)
         set(HinnantDate_ROOT_DIR "${HinnantDate_INCLUDE_DIR}")
         unset(HinnantDate_NOT_FOUND_MESSAGE)

From a3aacfe412f4bc419e77e35a383e76e3b5cde771 Mon Sep 17 00:00:00 2001
From: Egor Pugin <egor.pugin@gmail.com>
Date: Wed, 31 Jan 2018 18:32:11 +0300
Subject: [PATCH 4/4] Update comments.

---
 cmake/Modules/FindHinnantDate.cmake | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/cmake/Modules/FindHinnantDate.cmake b/cmake/Modules/FindHinnantDate.cmake
index 44e90e2a..8a2f1deb 100644
--- a/cmake/Modules/FindHinnantDate.cmake
+++ b/cmake/Modules/FindHinnantDate.cmake
@@ -72,10 +72,8 @@ if (HinnantDate_INCLUDE_FILE)
         unset(HinnantDate_INCLUDE_FILE CACHE)
     else()
         # Check succeeded, create target
-        # remove filename
-        get_filename_component(HinnantDate_INCLUDE_DIR "${HinnantDate_INCLUDE_FILE}" DIRECTORY)
-        # remove date dir
-        get_filename_component(HinnantDate_INCLUDE_DIR "${HinnantDate_INCLUDE_DIR}" DIRECTORY)
+        get_filename_component(HinnantDate_INCLUDE_DIR "${HinnantDate_INCLUDE_FILE}" DIRECTORY) # remove filename
+        get_filename_component(HinnantDate_INCLUDE_DIR "${HinnantDate_INCLUDE_DIR}" DIRECTORY) # remove date dir
         mark_as_advanced(HinnantDate_INCLUDE_DIR)
         set(HinnantDate_ROOT_DIR "${HinnantDate_INCLUDE_DIR}")
         unset(HinnantDate_NOT_FOUND_MESSAGE)