Merge pull request #212 from egorpugin/develop

Load date library from date dir (since date v2.3).

.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%

.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:

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,8 @@ 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)
+        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)

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
 {

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>