From eb705b95319c2fbb9a31597765a41e58254533de Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 26 May 2020 11:30:01 -0400 Subject: Update links to gitlab.kitware.com repos to add `-/` GitLab now uses a `/-/` component between the `group/project` part of the URL and the `{issues,merge_requests,tree}` part so that it can support `group/subgroup/project` with arbitrary depth. --- .github/pull_request_template.md | 2 +- CMakeLists.txt | 2 +- Help/cpack_gen/deb.rst | 6 +++--- Help/cpack_gen/rpm.rst | 4 ++-- Help/dev/review.rst | 8 ++++---- Help/dev/testing.rst | 2 +- Help/release/3.10.rst | 2 +- Modules/CMakeDetermineCCompiler.cmake | 2 +- Modules/CMakeDetermineCXXCompiler.cmake | 2 +- Modules/CMakeFindEclipseCDT4.cmake | 2 +- Modules/Compiler/IAR.cmake | 2 +- Modules/ExternalProject.cmake | 2 +- Modules/FindHDF5.cmake | 4 ++-- Modules/readme.txt | 2 +- README.rst | 4 ++-- Source/cmExtraCodeBlocksGenerator.cxx | 4 ++-- Source/cmExtraEclipseCDT4Generator.cxx | 2 +- Source/cmExtraSublimeTextGenerator.cxx | 2 +- Tests/CPackComponents/Issue 7470.html | 4 ++-- Tests/CTestLimitDashJ/CMakeLists.txt | 2 +- Tests/QtAutogen/RerunMocPlugin/CMakeLists.txt | 4 ++-- Tests/RunCMake/Graphviz/GraphvizTestProject.cmake | 2 +- Tests/RunCMake/message/message-indent-multiline.cmake | 2 +- bootstrap | 2 +- 24 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d934bf9..5281c92 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,6 +2,6 @@ Thanks for your interest in contributing to CMake! The GitHub repository is a mirror provided for convenience, but CMake does not use GitHub pull requests for contribution. Please see - https://gitlab.kitware.com/cmake/cmake/tree/master/CONTRIBUTING.rst + https://gitlab.kitware.com/cmake/cmake/-/tree/master/CONTRIBUTING.rst for contribution instructions. GitHub OAuth may be used to sign in. diff --git a/CMakeLists.txt b/CMakeLists.txt index e6aaf60..35531c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE) if(CMAKE_SYSTEM_NAME STREQUAL "HP-UX") message(FATAL_ERROR "CMake no longer compiles on HP-UX. See\n" - " https://gitlab.kitware.com/cmake/cmake/issues/17137\n" + " https://gitlab.kitware.com/cmake/cmake/-/issues/17137\n" "Use CMake 3.9 or lower instead." ) endif() diff --git a/Help/cpack_gen/deb.rst b/Help/cpack_gen/deb.rst index db71c87..bf50c55 100644 --- a/Help/cpack_gen/deb.rst +++ b/Help/cpack_gen/deb.rst @@ -25,8 +25,8 @@ or a component GROUP name. Here are some CPack DEB generator wiki resources that are here for historic reasons and are no longer maintained but may still prove useful: - - https://gitlab.kitware.com/cmake/community/wikis/doc/cpack/Configuration - - https://gitlab.kitware.com/cmake/community/wikis/doc/cpack/PackageGenerators#deb-unix-only + - https://gitlab.kitware.com/cmake/community/-/wikis/doc/cpack/Configuration + - https://gitlab.kitware.com/cmake/community/-/wikis/doc/cpack/PackageGenerators#deb-unix-only List of CPack DEB generator specific variables: @@ -282,7 +282,7 @@ List of CPack DEB generator specific variables: You may need set :variable:`CMAKE_INSTALL_RPATH` to an appropriate value if you use this feature, because if you don't ``dpkg-shlibdeps`` may fail to find your own shared libs. - See https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling + See https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling .. variable:: CPACK_DEBIAN_PACKAGE_DEBUG diff --git a/Help/cpack_gen/rpm.rst b/Help/cpack_gen/rpm.rst index 66d5464..ccb7ebd 100644 --- a/Help/cpack_gen/rpm.rst +++ b/Help/cpack_gen/rpm.rst @@ -36,8 +36,8 @@ http://www.rpm.org/wiki/Docs Here are some CPack RPM generator wiki resources that are here for historic reasons and are no longer maintained but may still prove useful: - - https://gitlab.kitware.com/cmake/community/wikis/doc/cpack/Configuration - - https://gitlab.kitware.com/cmake/community/wikis/doc/cpack/PackageGenerators#rpm-unix-only + - https://gitlab.kitware.com/cmake/community/-/wikis/doc/cpack/Configuration + - https://gitlab.kitware.com/cmake/community/-/wikis/doc/cpack/PackageGenerators#rpm-unix-only List of CPack RPM generator specific variables: diff --git a/Help/dev/review.rst b/Help/dev/review.rst index 8ec41d2..ad0bb22 100644 --- a/Help/dev/review.rst +++ b/Help/dev/review.rst @@ -28,7 +28,7 @@ request is accepted" option when creating the MR or by editing it. This will cause the MR topic branch to be automatically removed from the user's fork during the `Merge`_ step. -.. _`CMake Merge Requests Page`: https://gitlab.kitware.com/cmake/cmake/merge_requests +.. _`CMake Merge Requests Page`: https://gitlab.kitware.com/cmake/cmake/-/merge_requests .. _`CMake Repository`: https://gitlab.kitware.com/cmake/cmake Workflow Status @@ -60,7 +60,7 @@ in GitLab to track the state of a MR: The workflow status labels are intended to be mutually exclusive, so please remove any existing workflow label when adding one. -.. _`CMake GitLab Project Developers`: https://gitlab.kitware.com/cmake/cmake/settings/members +.. _`CMake GitLab Project Developers`: https://gitlab.kitware.com/cmake/cmake/-/settings/members Robot Review ============ @@ -454,8 +454,8 @@ comment instead): The ``-t`` option to a ``Do: merge`` command overrides any topic rename set in the MR description. -.. _`CMake GitLab Project Masters`: https://gitlab.kitware.com/cmake/cmake/settings/members -.. _`backport instructions`: https://gitlab.kitware.com/utils/git-workflow/wikis/Backport-topics +.. _`CMake GitLab Project Masters`: https://gitlab.kitware.com/cmake/cmake/-/settings/members +.. _`backport instructions`: https://gitlab.kitware.com/utils/git-workflow/-/wikis/Backport-topics .. _`git rev-parse`: https://git-scm.com/docs/git-rev-parse Close diff --git a/Help/dev/testing.rst b/Help/dev/testing.rst index 23d0ca3..279e4b2 100644 --- a/Help/dev/testing.rst +++ b/Help/dev/testing.rst @@ -33,7 +33,7 @@ CTest script with local settings and include ``cmake_common.cmake``. .. _`CMake Review Process`: review.rst .. _`CMake CDash Page`: https://open.cdash.org/index.php?project=CMake .. _`CMake Dashboard Scripts Repository`: https://gitlab.kitware.com/cmake/dashboard-scripts -.. _`cmake_common.cmake`: https://gitlab.kitware.com/cmake/dashboard-scripts/blob/master/cmake_common.cmake +.. _`cmake_common.cmake`: https://gitlab.kitware.com/cmake/dashboard-scripts/-/blob/master/cmake_common.cmake Nightly Start Time ------------------ diff --git a/Help/release/3.10.rst b/Help/release/3.10.rst index 03eda36..117415b 100644 --- a/Help/release/3.10.rst +++ b/Help/release/3.10.rst @@ -236,7 +236,7 @@ Deprecated and Removed Features support for C++11 and a port of libuv. See `CMake Issue 17137`_. Use CMake 3.9 or lower instead for HP-UX support. -.. _`CMake Issue 17137`: https://gitlab.kitware.com/cmake/cmake/issues/17137 +.. _`CMake Issue 17137`: https://gitlab.kitware.com/cmake/cmake/-/issues/17137 Other Changes ============= diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake index f870956..86683d1 100644 --- a/Modules/CMakeDetermineCCompiler.cmake +++ b/Modules/CMakeDetermineCCompiler.cmake @@ -99,7 +99,7 @@ if(NOT CMAKE_C_COMPILER_ID_RUN) CMAKE_C_COMPILER_ID_PLATFORM_CONTENT) # The IAR compiler produces weird output. - # See https://gitlab.kitware.com/cmake/cmake/issues/10176#note_153591 + # See https://gitlab.kitware.com/cmake/cmake/-/issues/10176#note_153591 list(APPEND CMAKE_C_COMPILER_ID_VENDORS IAR) set(CMAKE_C_COMPILER_ID_VENDOR_FLAGS_IAR ) set(CMAKE_C_COMPILER_ID_VENDOR_REGEX_IAR "IAR .+ Compiler") diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index e6b46b8..662b831 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -94,7 +94,7 @@ if(NOT CMAKE_CXX_COMPILER_ID_RUN) CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT) # The IAR compiler produces weird output. - # See https://gitlab.kitware.com/cmake/cmake/issues/10176#note_153591 + # See https://gitlab.kitware.com/cmake/cmake/-/issues/10176#note_153591 list(APPEND CMAKE_CXX_COMPILER_ID_VENDORS IAR) set(CMAKE_CXX_COMPILER_ID_VENDOR_FLAGS_IAR ) set(CMAKE_CXX_COMPILER_ID_VENDOR_REGEX_IAR "IAR .+ Compiler") diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake index 199005d..e563a12 100644 --- a/Modules/CMakeFindEclipseCDT4.cmake +++ b/Modules/CMakeFindEclipseCDT4.cmake @@ -25,7 +25,7 @@ function(_FIND_ECLIPSE_VERSION) if(NOT DEFINED CMAKE_ECLIPSE_VERSION) if(CMAKE_ECLIPSE_EXECUTABLE) - # use REALPATH to resolve symlinks (https://gitlab.kitware.com/cmake/cmake/issues/13036) + # use REALPATH to resolve symlinks (https://gitlab.kitware.com/cmake/cmake/-/issues/13036) get_filename_component(_REALPATH_CMAKE_ECLIPSE_EXECUTABLE "${CMAKE_ECLIPSE_EXECUTABLE}" REALPATH) get_filename_component(_ECLIPSE_DIR "${_REALPATH_CMAKE_ECLIPSE_EXECUTABLE}" PATH) file(GLOB _ECLIPSE_FEATURE_DIR "${_ECLIPSE_DIR}/features/org.eclipse.platform*") diff --git a/Modules/Compiler/IAR.cmake b/Modules/Compiler/IAR.cmake index 8e75caa..296e2fd 100644 --- a/Modules/Compiler/IAR.cmake +++ b/Modules/Compiler/IAR.cmake @@ -1,6 +1,6 @@ # This file is processed when the IAR compiler is used for a C or C++ file # Documentation can be downloaded here: http://www.iar.com/website1/1.0.1.0/675/1/ -# The initial feature request is here: https://gitlab.kitware.com/cmake/cmake/issues/10176 +# The initial feature request is here: https://gitlab.kitware.com/cmake/cmake/-/issues/10176 # It also contains additional links and information. # See USER GUIDES -> C/C++ Development Guide and ReleaseNotes for EWARM: # version 6.30.8: http://supp.iar.com/FilesPublic/UPDINFO/006607/arm/doc/infocenter/index.ENU.html diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index e366b80..3a47090 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -2942,7 +2942,7 @@ function(_ep_add_configure_command name) # If anything about the configure command changes, (command itself, cmake # used, cmake args or cmake generator) then re-run the configure step. - # Fixes issue https://gitlab.kitware.com/cmake/cmake/issues/10258 + # Fixes issue https://gitlab.kitware.com/cmake/cmake/-/issues/10258 # if(NOT EXISTS ${tmp_dir}/${name}-cfgcmd.txt.in) file(WRITE ${tmp_dir}/${name}-cfgcmd.txt.in "cmd='\@cmd\@'\n") diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index 8d71d27..60a313d 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -823,7 +823,7 @@ if( NOT HDF5_FOUND ) if(HDF5_USE_STATIC_LIBRARIES) # According to bug 1643 on the CMake bug tracker, this is the # preferred method for searching for a static library. - # See https://gitlab.kitware.com/cmake/cmake/issues/1643. We search + # See https://gitlab.kitware.com/cmake/cmake/-/issues/1643. We search # first for the full static library name, but fall back to a # generic search on the name if the static search fails. set( THIS_LIBRARY_SEARCH_DEBUG @@ -864,7 +864,7 @@ if( NOT HDF5_FOUND ) if(HDF5_USE_STATIC_LIBRARIES) # According to bug 1643 on the CMake bug tracker, this is the # preferred method for searching for a static library. - # See https://gitlab.kitware.com/cmake/cmake/issues/1643. We search + # See https://gitlab.kitware.com/cmake/cmake/-/issues/1643. We search # first for the full static library name, but fall back to a # generic search on the name if the static search fails. set( THIS_LIBRARY_SEARCH_DEBUG diff --git a/Modules/readme.txt b/Modules/readme.txt index a629478..da78730 100644 --- a/Modules/readme.txt +++ b/Modules/readme.txt @@ -1,4 +1,4 @@ See the "Find Modules" section of the cmake-developer(7) manual page. For more information about how to contribute modules to CMake, see this page: -https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/dev/Module-Maintainers +https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/dev/Module-Maintainers diff --git a/README.rst b/README.rst index 5020d39..64e2353 100644 --- a/README.rst +++ b/README.rst @@ -11,7 +11,7 @@ references useful guides and recipes. .. _`CMake Home Page`: https://cmake.org .. _`CMake Documentation Page`: https://cmake.org/documentation -.. _`CMake Community Wiki`: https://gitlab.kitware.com/cmake/community/wikis/home +.. _`CMake Community Wiki`: https://gitlab.kitware.com/cmake/community/-/wikis/home CMake is maintained and supported by `Kitware`_ and developed in collaboration with a productive community of contributors. @@ -122,7 +122,7 @@ If you have found a bug: 3. Finally, if the issue is not resolved by the above steps, open an entry in the `CMake Issue Tracker`_. -.. _`CMake Issue Tracker`: https://gitlab.kitware.com/cmake/cmake/issues +.. _`CMake Issue Tracker`: https://gitlab.kitware.com/cmake/cmake/-/issues Contributing ============ diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 42fd0ea..32b0ca9 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -723,7 +723,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand( if (generator == "NMake Makefiles" || generator == "NMake Makefiles JOM") { // For Windows ConvertToOutputPath already adds quotes when required. // These need to be escaped, see - // https://gitlab.kitware.com/cmake/cmake/issues/13952 + // https://gitlab.kitware.com/cmake/cmake/-/issues/13952 std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile); command += " /NOLOGO /f "; command += makefileName; @@ -731,7 +731,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand( command += target; } else if (generator == "MinGW Makefiles") { // no escaping of spaces in this case, see - // https://gitlab.kitware.com/cmake/cmake/issues/10014 + // https://gitlab.kitware.com/cmake/cmake/-/issues/10014 std::string const& makefileName = makefile; command += " -f \""; command += makefileName; diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index 80d61c3..582a9f0 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -429,7 +429,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile() if (this->IsOutOfSourceBuild) { // create a linked resource to CMAKE_SOURCE_DIR // (this is not done anymore for each project because of - // https://gitlab.kitware.com/cmake/cmake/issues/9978 and because I found + // https://gitlab.kitware.com/cmake/cmake/-/issues/9978 and because I found // it actually quite confusing in bigger projects with many directories and // projects, Alex diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx index 6dbc7b7..253834f 100644 --- a/Source/cmExtraSublimeTextGenerator.cxx +++ b/Source/cmExtraSublimeTextGenerator.cxx @@ -329,7 +329,7 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand( std::string makefileName; if (generator == "MinGW Makefiles") { // no escaping of spaces in this case, see - // https://gitlab.kitware.com/cmake/cmake/issues/10014 + // https://gitlab.kitware.com/cmake/cmake/-/issues/10014 makefileName = makefile; } else { makefileName = cmSystemTools::ConvertToOutputPath(makefile); diff --git a/Tests/CPackComponents/Issue 7470.html b/Tests/CPackComponents/Issue 7470.html index c2a1688..59fbee7 100644 --- a/Tests/CPackComponents/Issue 7470.html +++ b/Tests/CPackComponents/Issue 7470.html @@ -3,7 +3,7 @@ The install rule for this file demonstrates the problem described in
CMake issue #7470:

- -https://gitlab.kitware.com/cmake/cmake/issues/7470
+ +https://gitlab.kitware.com/cmake/cmake/-/issues/7470
diff --git a/Tests/CTestLimitDashJ/CMakeLists.txt b/Tests/CTestLimitDashJ/CMakeLists.txt index 92d743f..5208d2d 100644 --- a/Tests/CTestLimitDashJ/CMakeLists.txt +++ b/Tests/CTestLimitDashJ/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8) project(CTestLimitDashJ NONE) -# This file demonstrates https://gitlab.kitware.com/cmake/cmake/issues/12904 +# This file demonstrates https://gitlab.kitware.com/cmake/cmake/-/issues/12904 # when configured with CMake 2.8.10.2 and earlier, and when running # "ctest -j 4" in the resulting build tree. This example is hard-coded # to assume -j 4 just to reproduce the issue easily. Adjust the diff --git a/Tests/QtAutogen/RerunMocPlugin/CMakeLists.txt b/Tests/QtAutogen/RerunMocPlugin/CMakeLists.txt index e1951f1..a7fb2d7 100644 --- a/Tests/QtAutogen/RerunMocPlugin/CMakeLists.txt +++ b/Tests/QtAutogen/RerunMocPlugin/CMakeLists.txt @@ -104,7 +104,7 @@ require_change_not(B) require_change(C) require_change(D) # There's a bug in Ninja on Windows: -# https://gitlab.kitware.com/cmake/cmake/issues/16776 +# https://gitlab.kitware.com/cmake/cmake/-/issues/16776 if(NOT ("${CMAKE_GENERATOR}" MATCHES "Ninja")) require_change(E) endif() @@ -128,7 +128,7 @@ require_change_not(B) require_change(C) require_change(D) # There's a bug in Ninja on Windows -# https://gitlab.kitware.com/cmake/cmake/issues/16776 +# https://gitlab.kitware.com/cmake/cmake/-/issues/16776 if(NOT ("${CMAKE_GENERATOR}" MATCHES "Ninja")) require_change(E) endif() diff --git a/Tests/RunCMake/Graphviz/GraphvizTestProject.cmake b/Tests/RunCMake/Graphviz/GraphvizTestProject.cmake index 772f312..10cd2bc 100644 --- a/Tests/RunCMake/Graphviz/GraphvizTestProject.cmake +++ b/Tests/RunCMake/Graphviz/GraphvizTestProject.cmake @@ -32,7 +32,7 @@ target_link_libraries(GraphicLibrary PRIVATE CoreLibrary) # Test target labels with quotes in them; they should be escaped in the dot # file. -# See https://gitlab.kitware.com/cmake/cmake/issues/19746 +# See https://gitlab.kitware.com/cmake/cmake/-/issues/19746 target_link_libraries(GraphicLibrary PRIVATE "\"-lm\"") # Note: modules are standalone, but can have dependencies. diff --git a/Tests/RunCMake/message/message-indent-multiline.cmake b/Tests/RunCMake/message/message-indent-multiline.cmake index 0f789bf..3815569 100644 --- a/Tests/RunCMake/message/message-indent-multiline.cmake +++ b/Tests/RunCMake/message/message-indent-multiline.cmake @@ -9,5 +9,5 @@ message]]) # No `\n` at the end! message(STATUS "${msg}\n\n") message(STATUS "${msg}") # This is just to make sure NOTICE messages are also get indented: -# https://gitlab.kitware.com/cmake/cmake/issues/19418#note_588011 +# https://gitlab.kitware.com/cmake/cmake/-/issues/19418#note_588011 message(NOTICE "${msg}") diff --git a/bootstrap b/bootstrap index 6b205cc..fe7b2ad 100755 --- a/bootstrap +++ b/bootstrap @@ -139,7 +139,7 @@ fi if echo "${cmake_system}" | grep HP-UX >/dev/null 2>&1; then die 'CMake no longer compiles on HP-UX. See - https://gitlab.kitware.com/cmake/cmake/issues/17137 + https://gitlab.kitware.com/cmake/cmake/-/issues/17137 Use CMake 3.9 or lower instead.' cmake_system_hpux=true -- cgit v0.12