Skip to content

Commit a41b7f0

Browse files
committed
Merge pull request #1046 from simon04/cmake-3.15
cmake: add versions 3.13, 3.14, 3.15
2 parents 6646b10 + dc2503d commit a41b7f0

File tree

3 files changed

+28
-12
lines changed

3 files changed

+28
-12
lines changed

assets/javascripts/templates/pages/about_tmpl.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ credits = [
163163
'https://github.com/clojure/clojure/blob/master/epl-v10.html'
164164
], [
165165
'CMake',
166-
'2000-2018 Kitware, Inc. and Contributors',
166+
'2000-2019 Kitware, Inc. and Contributors',
167167
'BSD',
168168
'https://cmake.org/licensing/'
169169
], [

lib/docs/filters/cmake/entries.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class EntriesFilter < Docs::EntriesFilter
2020
'prop_sf' => 'Properties: Source Files',
2121
'prop_test' => 'Properties: Tests',
2222
'prop_tgt' => 'Properties: Targets',
23+
'envvar' => 'Environment Variables',
2324
'variable' => 'Variables' }
2425

2526
def get_name

lib/docs/scrapers/cmake.rb

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,66 @@ class Cmake < UrlScraper
1313
options[:title] = false
1414
options[:root_title] = 'CMake Reference Documentation'
1515
options[:skip] = %w(release/index.html genindex.html search.html)
16-
options[:skip_patterns] = [/\Agenerator/, /\Ainclude/, /\Arelease/]
16+
options[:skip_patterns] = [/\Agenerator/, /\Acpack_gen/, /\Ainclude/, /\Arelease/]
1717

1818
options[:attribution] = <<-HTML
19-
&copy; 2000&ndash;2018 Kitware, Inc. and Contributors<br>
19+
&copy; 2000&ndash;2019 Kitware, Inc. and Contributors<br>
2020
Licensed under the BSD 3-clause License.
2121
HTML
2222

23+
version '3.15' do
24+
self.release = '3.15.2'
25+
self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
26+
end
27+
28+
version '3.14' do
29+
self.release = '3.14.6'
30+
self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
31+
end
32+
33+
version '3.13' do
34+
self.release = '3.13.5'
35+
self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
36+
end
37+
2338
version '3.12' do
24-
self.release = '3.12.1'
25-
self.base_url = 'https://cmake.org/cmake/help/v3.12/'
39+
self.release = '3.12.4'
40+
self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
2641
end
2742

2843
version '3.11' do
2944
self.release = '3.11.4'
30-
self.base_url = 'https://cmake.org/cmake/help/v3.11/'
45+
self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
3146
end
3247

3348
version '3.10' do
3449
self.release = '3.10.3'
35-
self.base_url = 'https://cmake.org/cmake/help/v3.10/'
50+
self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
3651
end
3752

3853
version '3.9' do
3954
self.release = '3.9.6'
40-
self.base_url = 'https://cmake.org/cmake/help/v3.9/'
55+
self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
4156
end
4257

4358
version '3.8' do
4459
self.release = '3.8.2'
45-
self.base_url = 'https://cmake.org/cmake/help/v3.8/'
60+
self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
4661
end
4762

4863
version '3.7' do
4964
self.release = '3.7.2'
50-
self.base_url = 'https://cmake.org/cmake/help/v3.7/'
65+
self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
5166
end
5267

5368
version '3.6' do
5469
self.release = '3.6.3'
55-
self.base_url = 'https://cmake.org/cmake/help/v3.6/'
70+
self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
5671
end
5772

5873
version '3.5' do
5974
self.release = '3.5.2'
60-
self.base_url = 'https://cmake.org/cmake/help/v3.5/'
75+
self.base_url = "https://cmake.org/cmake/help/v#{self.version}/"
6176
end
6277

6378
def get_latest_version(opts)

0 commit comments

Comments
 (0)