From 897fdd188337a36a47ef88befa8ce9c0cbee6c4f Mon Sep 17 00:00:00 2001
From: Simon Legner <Simon.Legner@gmail.com>
Date: Thu, 8 Aug 2019 16:57:41 +0200
Subject: [PATCH 1/2] cmake: add versions 3.13, 3.14, 3.15

---
 .../templates/pages/about_tmpl.coffee         |  2 +-
 lib/docs/filters/cmake/entries.rb             |  1 +
 lib/docs/scrapers/cmake.rb                    | 35 +++++++++++++------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee
index aa51f5d1..c2461238 100644
--- a/assets/javascripts/templates/pages/about_tmpl.coffee
+++ b/assets/javascripts/templates/pages/about_tmpl.coffee
@@ -163,7 +163,7 @@ credits = [
     'https://github.com/clojure/clojure/blob/master/epl-v10.html'
   ], [
     'CMake',
-    '2000-2018 Kitware, Inc. and Contributors',
+    '2000-2019 Kitware, Inc. and Contributors',
     'BSD',
     'https://cmake.org/licensing/'
   ], [
diff --git a/lib/docs/filters/cmake/entries.rb b/lib/docs/filters/cmake/entries.rb
index f58c49fc..2d64279b 100644
--- a/lib/docs/filters/cmake/entries.rb
+++ b/lib/docs/filters/cmake/entries.rb
@@ -20,6 +20,7 @@ module Docs
         'prop_sf' => 'Properties: Source Files',
         'prop_test' => 'Properties: Tests',
         'prop_tgt' => 'Properties: Targets',
+        'envvar' => 'Environment Variables',
         'variable' => 'Variables' }
 
       def get_name
diff --git a/lib/docs/scrapers/cmake.rb b/lib/docs/scrapers/cmake.rb
index 7548a4a9..bf10ea65 100644
--- a/lib/docs/scrapers/cmake.rb
+++ b/lib/docs/scrapers/cmake.rb
@@ -13,51 +13,66 @@ module Docs
     options[:title] = false
     options[:root_title] = 'CMake Reference Documentation'
     options[:skip] = %w(release/index.html genindex.html search.html)
-    options[:skip_patterns] = [/\Agenerator/, /\Ainclude/, /\Arelease/]
+    options[:skip_patterns] = [/\Agenerator/, /\Acpack_gen/, /\Ainclude/, /\Arelease/]
 
     options[:attribution] = <<-HTML
-      &copy; 2000&ndash;2018 Kitware, Inc. and Contributors<br>
+      &copy; 2000&ndash;2019 Kitware, Inc. and Contributors<br>
       Licensed under the BSD 3-clause License.
     HTML
 
+    version '3.15' do
+      self.release = '3.15.2'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
+    end
+
+    version '3.14' do
+      self.release = '3.14.6'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
+    end
+
+    version '3.13' do
+      self.release = '3.13.5'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
+    end
+
     version '3.12' do
       self.release = '3.12.1'
-      self.base_url = 'https://cmake.org/cmake/help/v3.12/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
 
     version '3.11' do
       self.release = '3.11.4'
-      self.base_url = 'https://cmake.org/cmake/help/v3.11/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
 
     version '3.10' do
       self.release = '3.10.3'
-      self.base_url = 'https://cmake.org/cmake/help/v3.10/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
 
     version '3.9' do
       self.release = '3.9.6'
-      self.base_url = 'https://cmake.org/cmake/help/v3.9/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
 
     version '3.8' do
       self.release = '3.8.2'
-      self.base_url = 'https://cmake.org/cmake/help/v3.8/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
 
     version '3.7' do
       self.release = '3.7.2'
-      self.base_url = 'https://cmake.org/cmake/help/v3.7/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
 
     version '3.6' do
       self.release = '3.6.3'
-      self.base_url = 'https://cmake.org/cmake/help/v3.6/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
 
     version '3.5' do
       self.release = '3.5.2'
-      self.base_url = 'https://cmake.org/cmake/help/v3.5/'
+      self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end
 
     def get_latest_version(opts)

From dc2503d439dd45a802af8f188e4f2a70ef5cd494 Mon Sep 17 00:00:00 2001
From: Jasper van Merle <jaspervmerle@gmail.com>
Date: Thu, 8 Aug 2019 23:21:09 +0200
Subject: [PATCH 2/2] cmake: update 3.12's release version

---
 lib/docs/scrapers/cmake.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/docs/scrapers/cmake.rb b/lib/docs/scrapers/cmake.rb
index bf10ea65..52e5e87a 100644
--- a/lib/docs/scrapers/cmake.rb
+++ b/lib/docs/scrapers/cmake.rb
@@ -36,7 +36,7 @@ module Docs
     end
 
     version '3.12' do
-      self.release = '3.12.1'
+      self.release = '3.12.4'
       self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
     end