diff options
| -rw-r--r-- | Help/manual/cmake.1.rst | 5 | ||||
| -rw-r--r-- | Help/manual/ctest.1.rst | 8 | ||||
| -rw-r--r-- | Modules/CPack.cmake | 3 | ||||
| -rw-r--r-- | Modules/Platform/Windows-LLVMFlang-Fortran.cmake | 1 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudioGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmake.cxx | 5 |
6 files changed, 23 insertions, 2 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 3dc6d69..35bd05f 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -142,6 +142,9 @@ source and build trees and generate a buildsystem: $ cmake . ``cmake [<options>] -S <path-to-source> -B <path-to-build>`` + + .. versionadded:: 3.13 + Uses ``<path-to-build>`` as the build tree and ``<path-to-source>`` as the source tree. The specified paths may be absolute or relative to the current working directory. The source tree must contain a @@ -555,6 +558,8 @@ following options: .. option:: -j [<jobs>], --parallel [<jobs>] + .. versionadded:: 3.12 + The maximum number of concurrent processes to use when building. If ``<jobs>`` is omitted the native build tool's default number is used. diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 1e691be..3497a9f 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -168,6 +168,8 @@ Run Tests .. option:: --output-junit <file> + .. versionadded:: 3.21 + Write test results in JUnit format. This option tells CTest to write test results to ``<file>`` in JUnit XML @@ -183,6 +185,10 @@ Run Tests actually run them. Useful in conjunction with the :option:`-R <ctest -R>` and :option:`-E <ctest -E>` options. + .. versionadded:: 3.14 + + The ``--show-only`` option accepts a ``<format>`` value. + ``<format>`` can be one of the following values. ``human`` @@ -1491,6 +1497,8 @@ Configuration settings include: Show as JSON Object Model ========================= +.. versionadded:: 3.14 + When the ``--show-only=json-v1`` command line option is given, the test information is output in JSON format. Version 1.0 of the JSON object model is defined as follows: diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 828d9ca..7c3ad6b 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -217,7 +217,8 @@ installers. The most commonly-used variables are: to the user by the produced installer (often with an explicit "Accept" button, for graphical installers) prior to installation. This license file is NOT added to the installed files but is used by some CPack generators - like NSIS. If you want to install a license file (may be the same as this + like NSIS. If you want to use UTF-8 characters, the file needs to be encoded + in UTF-8 BOM. If you want to install a license file (may be the same as this one) along with your project, you must add an appropriate CMake :command:`install` command in your ``CMakeLists.txt``. diff --git a/Modules/Platform/Windows-LLVMFlang-Fortran.cmake b/Modules/Platform/Windows-LLVMFlang-Fortran.cmake index 42c283a..64dc0da 100644 --- a/Modules/Platform/Windows-LLVMFlang-Fortran.cmake +++ b/Modules/Platform/Windows-LLVMFlang-Fortran.cmake @@ -1,2 +1,3 @@ include(Platform/Windows-GNU) +__windows_compiler_gnu(Fortran) # TODO: MSVC ABI Support diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx index deed3f8..9d168d0 100644 --- a/Source/cmGlobalVisualStudioGenerator.cxx +++ b/Source/cmGlobalVisualStudioGenerator.cxx @@ -620,7 +620,8 @@ bool IsVisualStudioMacrosFileRegistered(const std::string& macrosFile, RegCloseKey(hsubkey); } else { - std::cout << "error opening subkey: " << subkeyname << std::endl; + std::cout << "error opening subkey: " + << cmsys::Encoding::ToNarrow(subkeyname) << std::endl; std::cout << std::endl; } diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 8800792..67a8e01 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -787,6 +787,7 @@ enum class ListPresets Build, Test, Package, + Workflow, All, }; } @@ -1144,6 +1145,8 @@ void cmake::SetArgs(const std::vector<std::string>& args) listPresets = ListPresets::Test; } else if (value == "package") { listPresets = ListPresets::Package; + } else if (value == "workflow") { + listPresets = ListPresets::Workflow; } else if (value == "all") { listPresets = ListPresets::All; } else { @@ -1313,6 +1316,8 @@ void cmake::SetArgs(const std::vector<std::string>& args) presetsGraph.PrintTestPresetList(); } else if (listPresets == ListPresets::Package) { presetsGraph.PrintPackagePresetList(); + } else if (listPresets == ListPresets::Workflow) { + presetsGraph.PrintWorkflowPresetList(); } else if (listPresets == ListPresets::All) { presetsGraph.PrintAllPresets(); } |