diff options
Diffstat (limited to 'dev-util/cmake/files')
-rw-r--r-- | dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch | 46 | ||||
-rw-r--r-- | dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch | 29 |
2 files changed, 0 insertions, 75 deletions
diff --git a/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch b/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch deleted file mode 100644 index 898f8a75d7e0..000000000000 --- a/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 79be37b94e7353ec056e6343ba293ce1b60627d4 Mon Sep 17 00:00:00 2001 -From: Brad King <brad.king@kitware.com> -Date: Fri, 7 May 2021 08:51:40 -0400 -Subject: [PATCH] FindBoost: Add support for Boost 1.76 - -Update the list of known versions. - -Run the command - - cmake -DBOOST_DIR=/path/to/boost_1_76_0 \ - -P Utilities/Scripts/BoostScanDeps.cmake - -to extract dependencies from the 1.76.0 source tree. -They are the same as 1.75's dependencies, so just update -the version check for warning about newer versions. - -Fixes: #22167 ---- - Modules/FindBoost.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index f8887ad2be..d31f925cb6 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -1350,7 +1350,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - set(_Boost_TIMER_DEPENDENCIES chrono) - set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic) - set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) -- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.76.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) -+ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) - message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") - endif() - endif() -@@ -1622,7 +1622,7 @@ else() - # _Boost_COMPONENT_HEADERS. See the instructions at the top of - # _Boost_COMPONENT_DEPENDENCIES. - set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} -- "1.75.0" "1.75" "1.74.0" "1.74" -+ "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" - "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" - "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" - "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" --- -GitLab - diff --git a/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch b/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch deleted file mode 100644 index dabe39e0b376..000000000000 --- a/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bb9c69ed7052614546d34d98a9cf1218e4a45bdc Mon Sep 17 00:00:00 2001 -From: Brad King <brad.king@kitware.com> -Date: Fri, 14 May 2021 10:26:11 -0400 -Subject: [PATCH] Utilities/Sphinx: Update man page config for Sphinx 4 - -Sphinx 4 by default generates `man/#/foo.#`, but older versions generate -`man/foo.#` as our install rules expect. Update our Sphinx config file -to tell Sphinx 4 to use the old layout. - -Fixes: #22192 ---- - Utilities/Sphinx/conf.py.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in -index 5def681dc4..c383828bd7 100644 ---- a/Utilities/Sphinx/conf.py.in -+++ b/Utilities/Sphinx/conf.py.in -@@ -53,6 +53,7 @@ for fpath in cmake_manuals: - except Exception as e: - sys.stderr.write("ERROR: %s\n" % str(e)) - man_show_urls = False -+man_make_section_directory = False - - html_show_sourcelink = True - html_static_path = ['@conf_path@/static'] --- -GitLab - |