Skip to content

Commit dc0d79c

Browse files
SamuelMarksSamuelMarks
authored
[docs] Make Hunter and CMake versions consistent (#378)
1 parent 2a64593 commit dc0d79c

14 files changed

+52
-52
lines changed

‎docs/contributing.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ When contributing please follow the style guides:
2424

2525
.. note::
2626

27-
The minimum version of CMake for using Hunter is ``3.0``.
27+
The minimum version of CMake for using Hunter is ``3.2``.
2828
Please check that you're not using commands from newer versions
29-
(`see documentation for 3.0 <http://www.cmake.org/cmake/help/v3.0/>`__).
29+
(`see documentation for 3.2 <http://www.cmake.org/cmake/help/v3.2/>`__).
3030

3131
.. note::
3232

@@ -59,7 +59,7 @@ and working correctly. Before reporting bugs please check:
5959
6060
# CMakeLists.txt
6161
62-
cmake_minimum_required(VERSION 3.0)
62+
cmake_minimum_required(VERSION 3.2)
6363
project(foo)
6464
6565
add_executable(foo foo.cpp)

‎docs/creating-new/create/custom.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Test it using ``ExternalProject_Add``
2929
.. code-block:: bash
3030
3131
> cat CMakeLists.txt
32-
cmake_minimum_required(VERSION 3.0)
32+
cmake_minimum_required(VERSION 3.2)
3333
3434
include(ExternalProject) # ExternalProject_Add
3535
@@ -65,7 +65,7 @@ First, custom build scheme need to be added to ``cmake/schemes`` directory:
6565
> cd ${HUNTER_ROOT}
6666
> cat cmake/schemes/url_sha1_ios_sim.cmake.in
6767
# This is configuration file, variable @SOME_VARIABLE_NAME@ will be substituted during configure_file command
68-
cmake_minimum_required(VERSION 3.0)
68+
cmake_minimum_required(VERSION 3.2)
6969
7070
# If such variables like `CMAKE_CXX_FLAGS` or `CMAKE_CXX_COMPILER` not used by scheme
7171
# setting `LANGUAGES` to `NONE` will speed-up build a little bit. If you have any problems/glitches
@@ -153,7 +153,7 @@ Now package ready to be used:
153153
.. code-block:: bash
154154
155155
> cat CMakeLists.txt
156-
cmake_minimum_required(VERSION 2.8)
156+
cmake_minimum_required(VERSION 3.2)
157157
158158
include("cmake/HunterGate.cmake")
159159

‎docs/faq/why-hunter-is-slow.rst

+8-8
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ option:
125125
126126
include("cmake/HunterGate.cmake")
127127
HunterGate(
128-
URL "https://github.com/cpp-pm/hunter/archive/v0.22.22.tar.gz"
129-
SHA1 "83f7dd182930dee784fafd29745f55e7cd06ca34"
128+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.297.tar.gz"
129+
SHA1 "3319fe6a3b08090df7df98dee75134d68e2ef5a3"
130130
)
131131
project(foo)
132132
@@ -187,8 +187,8 @@ As an example here are actions that can lead to incorrect cache state:
187187
188188
include("cmake/HunterGate.cmake")
189189
HunterGate(
190-
URL "https://github.com/cpp-pm/hunter/archive/v0.22.22.tar.gz"
191-
SHA1 "83f7dd182930dee784fafd29745f55e7cd06ca34"
190+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.297.tar.gz"
191+
SHA1 "3319fe6a3b08090df7df98dee75134d68e2ef5a3"
192192
)
193193
project(foo)
194194
@@ -245,8 +245,8 @@ And add "GTest" to CMakeLists.txt:
245245
246246
include("cmake/HunterGate.cmake")
247247
HunterGate(
248-
URL "https://github.com/cpp-pm/hunter/archive/v0.22.22.tar.gz"
249-
SHA1 "83f7dd182930dee784fafd29745f55e7cd06ca34"
248+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.297.tar.gz"
249+
SHA1 "3319fe6a3b08090df7df98dee75134d68e2ef5a3"
250250
)
251251
project(foo)
252252
@@ -299,7 +299,7 @@ Xcode generator only:
299299
300300
include("cmake/HunterGate.cmake")
301301
HunterGate(
302-
URL "https://github.com/cpp-pm/hunter/archive/v0.22.22.tar.gz"
303-
SHA1 "83f7dd182930dee784fafd29745f55e7cd06ca34"
302+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.297.tar.gz"
303+
SHA1 "3319fe6a3b08090df7df98dee75134d68e2ef5a3"
304304
)
305305
project(foo)

‎docs/overview/what-is-it.rst

+13-13
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ the ``URL`` and ``SHA1``:
1313
:emphasize-lines: 2-3
1414
1515
HunterGate(
16-
URL "https://github.com/cpp-pm/hunter/archive/v0.14.5.tar.gz"
17-
SHA1 "f2c3de6d13baf8c5d2aa77bdc47c516e668c677e"
16+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.297.tar.gz"
17+
SHA1 "3319fe6a3b08090df7df98dee75134d68e2ef5a3"
1818
)
1919
2020
Here is the content of the archive in simplified form:
2121

2222
.. code-block:: none
2323
24-
Hunter (0.14.15) = {
25-
Boost (1.60.0, 1.59.0, 1.58.0-p1, ...),
24+
Hunter (0.23.297) = {
25+
Boost (1.65.1, 1.65.0, 1.66.0, 1.66.0-p0, 1.67, ...),
2626
GTest (1.7.0, ...),
27-
OpenCV (3.0.0-beta, 2.4.11, 2.4.10, ...),
28-
OpenSSL (1.0.2g, 1.0.2f, 1.0.2e, ...),
27+
OpenCV (4.1.1-p0, 4.0.0-p3, 3.4.6-p0, ...),
28+
OpenSSL (1.1.1, 1.1.1a, 1.1.1b, 1.1.1c, 1.1.1d, 1.1.1g, 1.1.1g-p0, ...),
2929
...
3030
}
3131
@@ -47,19 +47,19 @@ package properties:
4747
.. code-block:: shell
4848
4949
VERSION
50-
"1.0.2g"
50+
"1.1.1"
5151
URL
52-
"https://github.com/openssl/openssl/archive/OpenSSL_1_0_2g.tar.gz"
52+
"https://github.com/openssl/openssl/archive/OpenSSL_1_1_1.tar.gz"
5353
--
5454
VERSION
55-
"1.0.2f"
55+
"1.1.1a"
5656
URL
57-
"https://github.com/openssl/openssl/archive/OpenSSL_1_0_2f.tar.gz"
57+
"https://github.com/openssl/openssl/archive/OpenSSL_1_1_1a.tar.gz"
5858
--
5959
VERSION
60-
"1.0.2e"
60+
"1.1.1b"
6161
URL
62-
"https://github.com/openssl/openssl/archive/OpenSSL_1_0_2e.tar.gz"
62+
"https://github.com/openssl/openssl/archive/OpenSSL_1_1_1b.tar.gz"
6363
6464
Install instructions from build scheme `url_sha1_openssl.cmake.in`_:
6565

@@ -83,7 +83,7 @@ Default version from `default.cmake`_
8383

8484
.. code-block:: cmake
8585
86-
hunter_default_version(OpenSSL VERSION 1.0.2g)
86+
hunter_default_version(OpenSSL VERSION 1.1.1)
8787
8888
.. seealso::
8989

‎docs/packages/pkg/flex.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Simple flex example (no bison).
2525
target_include_directories(main PUBLIC ${FLEX_INCLUDE_DIRS})
2626
target_link_libraries(main ${FLEX_LIBRARIES})
2727
28-
More complex example involving flex and bison. Based on `FindFLEX <https://cmake.org/cmake/help/v3.0/module/FindFLEX.html>`__.
28+
More complex example involving flex and bison. Based on `FindFLEX <https://cmake.org/cmake/help/v3.2/module/FindFLEX.html>`__.
2929

3030
.. code-block:: cmake
3131

‎docs/quick-start/boost-components.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ this repository** in general, see `notes`_):
3838
:emphasize-lines: 2, 3
3939
4040
HunterGate(
41-
URL "https://github.com/cpp-pm/hunter/archive/v0.16.15.tar.gz"
42-
SHA1 "6974c2150fc0d3b09de3ad1efcbf15d360647ffa"
41+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.297.tar.gz"
42+
SHA1 "3319fe6a3b08090df7df98dee75134d68e2ef5a3"
4343
)
4444
4545
Now project can be started:
@@ -72,8 +72,8 @@ Summarize:
7272
7373
include("cmake/HunterGate.cmake")
7474
HunterGate(
75-
URL "https://github.com/cpp-pm/hunter/archive/v0.10.9.tar.gz"
76-
SHA1 "53b198e364dc7bc8360fc545f798563229bd7e20"
75+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.297.tar.gz"
76+
SHA1 "3319fe6a3b08090df7df98dee75134d68e2ef5a3"
7777
)
7878
7979
project(Foo)

‎docs/reference/errors/error.hunteraddpackage.after.project.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ What to do
2626
.. code-block:: cmake
2727
2828
# Check CMake version before any commands
29-
cmake_minimum_required(VERSION 3.0)
29+
cmake_minimum_required(VERSION 3.2)
3030
3131
# Load HunterGate module
3232
include("cmake/HunterGate.cmake")

‎docs/reference/errors/error.huntergate.before.project.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ What to do
2626
.. code-block:: cmake
2727
2828
# Check CMake version before any commands
29-
cmake_minimum_required(VERSION 3.0)
29+
cmake_minimum_required(VERSION 3.2)
3030
3131
# Load HunterGate module
3232
include("cmake/HunterGate.cmake")
@@ -48,7 +48,7 @@ What to do
4848
.. code-block:: cmake
4949
5050
# CMakeLists.txt
51-
cmake_minimum_required(VERSION 3.0)
51+
cmake_minimum_required(VERSION 3.2)
5252
include("cmake/HunterGate.cmake")
5353
HunterGate(URL ... SHA1 ...)
5454
add_subdirectory(subdir1)
@@ -63,7 +63,7 @@ What to do
6363
.. code-block:: cmake
6464
6565
# CMakeLists.txt
66-
cmake_minimum_required(VERSION 3.0)
66+
cmake_minimum_required(VERSION 3.2)
6767
include("cmake/HunterGate.cmake")
6868
HunterGate(URL ... SHA1 ...)
6969
project(Foo) # <--------------- before add_subdirectory

‎docs/reference/errors/error.no.toolchain.info.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ What happens
99
Explanation
1010
-----------
1111

12-
- Hunter use `try_compile <https://cmake.org/cmake/help/v3.0/command/try_compile.html>`_ to calculate `toolchain-id <https://github.com/ruslo/hunter#toolchain-id>`_. Internally ``*.cpp`` file with ``#pragma message(...)`` directives used to print different system macros. This error occurs when no information printed on compilation step.
12+
- Hunter use `try_compile <https://cmake.org/cmake/help/v3.2/command/try_compile.html>`_ to calculate `toolchain-id <https://github.com/ruslo/hunter#toolchain-id>`_. Internally ``*.cpp`` file with ``#pragma message(...)`` directives used to print different system macros. This error occurs when no information printed on compilation step.
1313

1414
What to do
1515
----------

‎docs/reference/errors/error.vs.devenv.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Explanation
1818
-----------
1919

2020
These paths can be used to determine tools which needed to build non-CMake projects (like Boost).
21-
- `CMAKE_VS_DEVENV_COMMAND <https://cmake.org/cmake/help/v3.0/variable/CMAKE_VS_DEVENV_COMMAND.html>`_ contains full path to ``devenv.com`` tool when using full versions of Visual Studio.
22-
- `CMAKE_VS_MSBUILD_COMMAND <https://cmake.org/cmake/help/v3.0/variable/CMAKE_VS_MSBUILD_COMMAND.html?highlight=cmake_vs_msbuild_command>`_ contains full path to ``MSBuild.exe`` tool.
21+
- `CMAKE_VS_DEVENV_COMMAND <https://cmake.org/cmake/help/v3.2/variable/CMAKE_VS_DEVENV_COMMAND.html>`_ contains full path to ``devenv.com`` tool when using full versions of Visual Studio.
22+
- `CMAKE_VS_MSBUILD_COMMAND <https://cmake.org/cmake/help/v3.2/variable/CMAKE_VS_MSBUILD_COMMAND.html?highlight=cmake_vs_msbuild_command>`_ contains full path to ``MSBuild.exe`` tool.
2323

2424
What to do
2525
----------

‎docs/reference/user-modules/hunter_config.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ All variants support specifying extra:
6363
* ``CONFIGURATION_TYPES`` (e.g. ``CONFIGURATION_TYPES Release MinSizeRel``)
6464
* ``KEEP_PACKAGE_SOURCES`` (see :ref:`HUNTER_KEEP_PACKAGE_SOURCES <hunter keep package sources>`)
6565

66-
.. _ExternalProject_Add: http://www.cmake.org/cmake/help/v3.0/module/ExternalProject.html
66+
.. _ExternalProject_Add: http://www.cmake.org/cmake/help/v3.2/module/ExternalProject.html

‎docs/reference/user-modules/hunter_source_subdir.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ It is meant to be used in the project definition at
2929
SOURCE_SUBDIR "cpp"
3030
)
3131
32-
.. _ExternalProject_Add: http://www.cmake.org/cmake/help/v3.0/module/ExternalProject.html
32+
.. _ExternalProject_Add: http://www.cmake.org/cmake/help/v3.2/module/ExternalProject.html

‎docs/reference/user-variables.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ HUNTER_JOBS_NUMBER
140140
* Set variable to ``0`` to disable adding any flags: ``HUNTER_JOBS_NUMBER=0``
141141
* Defaults to maximum of two:
142142

143-
* `NUMBER_OF_LOGICAL_CORES <http://www.cmake.org/cmake/help/v3.11/command/cmake_host_system_information.html>`__
144-
* `NUMBER_OF_PHYSICAL_CORES <http://www.cmake.org/cmake/help/v3.11/command/cmake_host_system_information.html>`__
143+
* `NUMBER_OF_LOGICAL_CORES <http://www.cmake.org/cmake/help/v3.2/command/cmake_host_system_information.html>`__
144+
* `NUMBER_OF_PHYSICAL_CORES <http://www.cmake.org/cmake/help/v3.2/command/cmake_host_system_information.html>`__
145145

146146
.. _hunter run install:
147147

‎docs/user-guides/hunter-user/git-submodule.rst

+9-9
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ and set the ``GIT_SUBMODULE`` flag:
2929
3030
# CMakeLists.txt
3131
32-
cmake_minimum_required(VERSION 3.0)
32+
cmake_minimum_required(VERSION 3.2)
3333
3434
include("cmake/HunterGate.cmake")
3535
HunterGate(
36-
URL "https://github.com/cpp-pm/hunter/archive/v0.18.58.tar.gz"
37-
SHA1 "3b39effc5ee1af4ef7487eabb1b0a7a7e10a7b3e"
36+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.297.tar.gz"
37+
SHA1 "3319fe6a3b08090df7df98dee75134d68e2ef5a3"
3838
LOCAL # <----- load cmake/Hunter/config.cmake
3939
)
4040
@@ -192,12 +192,12 @@ First let's remove ``LOCAL`` config and build standard TIFF with standard ZLIB:
192192
:emphasize-lines: 5-8
193193
194194
# CMakeLists.txt
195-
cmake_minimum_required(VERSION 3.0)
195+
cmake_minimum_required(VERSION 3.2)
196196
197197
include("cmake/HunterGate.cmake")
198198
HunterGate(
199-
URL "https://github.com/cpp-pm/hunter/archive/v0.18.58.tar.gz"
200-
SHA1 "3b39effc5ee1af4ef7487eabb1b0a7a7e10a7b3e"
199+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.297.tar.gz"
200+
SHA1 "3319fe6a3b08090df7df98dee75134d68e2ef5a3"
201201
)
202202
203203
project(foo)
@@ -226,12 +226,12 @@ Now let's add ``LOCAL`` back and run build again:
226226
227227
# CMakeLists.txt
228228
229-
cmake_minimum_required(VERSION 3.0)
229+
cmake_minimum_required(VERSION 3.2)
230230
231231
include("cmake/HunterGate.cmake")
232232
HunterGate(
233-
URL "https://github.com/cpp-pm/hunter/archive/v0.18.58.tar.gz"
234-
SHA1 "3b39effc5ee1af4ef7487eabb1b0a7a7e10a7b3e"
233+
URL "https://github.com/cpp-pm/hunter/archive/v0.23.297.tar.gz"
234+
SHA1 "3319fe6a3b08090df7df98dee75134d68e2ef5a3"
235235
LOCAL
236236
)
237237

0 commit comments

Comments
 (0)