(#5706) add ptz to header list and added new version (3.0.1)

* add ptz to header list * add ptz to header list * add version 3.0.1 * add patch for version 3.0.1
conan-io · Jun 2, 2021 · 420d253 · 420d253
1 parent 7fd64fa
commit 420d253
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/recipes/date/all/conandata.yml b/recipes/date/all/conandata.yml
@@ -5,6 +5,9 @@ sources:
   "3.0.0":
     sha256: 87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
     url: https://github.com/HowardHinnant/date/archive/v3.0.0.tar.gz
+  "3.0.1":
+    sha256: 7a390f200f0ccd207e8cff6757e04817c1a0aec3e327b006b7eb451c57ee3538
+    url: https://github.com/HowardHinnant/date/archive/v3.0.1.tar.gz
 patches:
   "2.4.1":
     - base_path: source_subfolder
@@ -16,3 +19,6 @@ patches:
   "3.0.0":
     - base_path: source_subfolder
       patch_file: patches/cmake-3.0.0.patch
+  "3.0.1":
+    - base_path: source_subfolder
+      patch_file: patches/cmake-3.0.1.patch
diff --git a/recipes/date/all/conanfile.py b/recipes/date/all/conanfile.py
@@ -56,6 +56,8 @@ def config_options(self):
             del self.options.fPIC
 
     def configure(self):
+        if self.options.shared:
+            del self.options.fPIC
         if self.settings.compiler.cppstd:
             tools.check_min_cppstd(self, "11")
 
@@ -87,6 +89,7 @@ def package(self):
             dst = os.path.join("include", "date")
             self.copy(pattern="date.h", dst=dst, src=src)
             self.copy(pattern="tz.h", dst=dst, src=src)
+            self.copy(pattern="ptz.h", dst=dst, src=src)
             self.copy(pattern="iso_week.h", dst=dst, src=src)
             self.copy(pattern="julian.h", dst=dst, src=src)
             self.copy(pattern="islamic.h", dst=dst, src=src)

diff --git a/recipes/date/all/patches/cmake-3.0.1.patch b/recipes/date/all/patches/cmake-3.0.1.patch
@@ -0,0 +1,14 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ad74900..ac390a9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -156,6 +156,9 @@ if( BUILD_TZ_LIB )
+         target_include_directories( date-tz SYSTEM PRIVATE ${CURL_INCLUDE_DIRS} )
+         target_link_libraries( date-tz PRIVATE ${CURL_LIBRARIES} )
+     endif( )
++    if( DISABLE_STRING_VIEW )
++      target_compile_definitions( date-tz PRIVATE -DHAS_STRING_VIEW=0 -DHAS_DEDUCTION_GUIDES=0 )
++    endif( )
+ endif( )
+
+ #[===================================================================[
diff --git a/recipes/date/config.yml b/recipes/date/config.yml
@@ -4,3 +4,5 @@ versions:
     folder: all
   "3.0.0":
     folder: all
+  "3.0.1":
+    folder: all