diff --git a/reference/commands/config.rst b/reference/commands/config.rst index 110a7d337305..eb749418cfbc 100644 --- a/reference/commands/config.rst +++ b/reference/commands/config.rst @@ -209,7 +209,6 @@ Displays all the Conan built-in configurations. There are 2 groups: core:non_interactive: Disable interactive user input, raises error if input necessary core:required_conan_version: Raise if current version does not match the defined range. tools.android:ndk_path: Argument for the CMAKE_ANDROID_NDK - tools.apple.xcodebuild:verbosity: Verbosity level for xcodebuild: 'verbose' or 'quiet tools.apple:enable_arc: (boolean) Enable/Disable ARC Apple Clang flags tools.apple:enable_bitcode: (boolean) Enable/Disable Bitcode Apple Clang flags tools.apple:enable_visibility: (boolean) Enable/Disable Visibility Apple Clang flags @@ -226,6 +225,7 @@ Displays all the Conan built-in configurations. There are 2 groups: tools.build:sharedlinkflags: List of extra flags used by CMakeToolchain for CMAKE_SHARED_LINKER_FLAGS_INIT variable tools.build:skip_test: Do not execute CMake.test() and Meson.test() when enabled tools.build:sysroot: Pass the --sysroot= flag if available. (None by default) + tools.build:verbosity: Verbosity of MSBuild and XCodeBuild build systems. Possible values are 'quiet', 'error', 'warning', 'notice', 'status', 'verbose', 'normal', 'debug', 'v', 'trace' and 'vv' tools.cmake.cmake_layout:build_folder_vars: Settings and Options that will produce a different build folder and different CMake presets names tools.cmake.cmaketoolchain:find_package_prefer_config: Argument for the CMAKE_FIND_PACKAGE_PREFER_CONFIG tools.cmake.cmaketoolchain:generator: User defined CMake generator to use instead of default @@ -255,7 +255,6 @@ Displays all the Conan built-in configurations. There are 2 groups: tools.microsoft.bash:subsystem: The subsystem to be used when conanfile.win_bash==True. Possible values: msys2, msys, cygwin, wsl, sfu tools.microsoft.msbuild:installation_path: VS install path, to avoid auto-detect via vswhere, like C:/Program Files (x86)/Microsoft Visual Studio/2019/Community. Use empty string to disable tools.microsoft.msbuild:max_cpu_count: Argument for the /m when running msvc to build parallel projects - tools.microsoft.msbuild:verbosity: Verbosity level for MSBuild: 'Quiet', 'Minimal', 'Normal', 'Detailed', 'Diagnostic' tools.microsoft.msbuild:vs_version: Defines the IDE version when using the new msvc compiler tools.microsoft.msbuilddeps:exclude_code_analysis: Suppress MSBuild code analysis for patterns tools.microsoft.msbuildtoolchain:compile_options: Dictionary with MSBuild compiler options diff --git a/reference/conanfile/attributes/consumers.inc b/reference/conanfile/attributes/consumers.inc index c917ffb57b8c..71d780a11f80 100644 --- a/reference/conanfile/attributes/consumers.inc +++ b/reference/conanfile/attributes/consumers.inc @@ -83,8 +83,8 @@ Should be only filled in the ``package_info()`` method. name = "pkg" def package_info(self): - self.conf_info.define("tools.microsoft.msbuild:verbosity", "Diagnostic") - self.conf_info.get("tools.microsoft.msbuild:verbosity") # == "Diagnostic" + self.conf_info.define("tools.build:verbosity", "debug") + self.conf_info.get("tools.build:verbosity") # == "debug" self.conf_info.append("user.myconf.build:ldflags", "--flag3") # == ["--flag1", "--flag2", "--flag3"] self.conf_info.update("tools.microsoft.msbuildtoolchain:compile_options", {"ExpandAttributedSource": "false"}) self.conf_info.unset("tools.microsoft.msbuildtoolchain:compile_options") diff --git a/reference/conanfile/methods/package_info.rst b/reference/conanfile/methods/package_info.rst index 75ca5109ffe3..e997b2d28d80 100644 --- a/reference/conanfile/methods/package_info.rst +++ b/reference/conanfile/methods/package_info.rst @@ -217,7 +217,7 @@ package packaging the AndroidNDK could do: def package_info(self): # Setting values - self.conf_info.define("tools.microsoft.msbuild:verbosity", "Diagnostic") + self.conf_info.define("tools.build:verbosity", "debug") self.conf_info.define("tools.system.package_manager:sudo", True) self.conf_info.define("tools.microsoft.msbuild:max_cpu_count", 2) self.conf_info.define("user.myconf.build:ldflags", ["--flag1", "--flag2"]) diff --git a/reference/config_files/global_conf.rst b/reference/config_files/global_conf.rst index 60bf1a2ca5b9..5c0c911c035c 100644 --- a/reference/config_files/global_conf.rst +++ b/reference/config_files/global_conf.rst @@ -57,7 +57,6 @@ To list all the possible configurations available, run :command:`conan config li core:non_interactive: Disable interactive user input, raises error if input necessary core:required_conan_version: Raise if current version does not match the defined range. tools.android:ndk_path: Argument for the CMAKE_ANDROID_NDK - tools.apple.xcodebuild:verbosity: Verbosity level for xcodebuild: 'verbose' or 'quiet tools.apple:enable_arc: (boolean) Enable/Disable ARC Apple Clang flags tools.apple:enable_bitcode: (boolean) Enable/Disable Bitcode Apple Clang flags tools.apple:enable_visibility: (boolean) Enable/Disable Visibility Apple Clang flags @@ -74,6 +73,7 @@ To list all the possible configurations available, run :command:`conan config li tools.build:sharedlinkflags: List of extra flags used by CMakeToolchain for CMAKE_SHARED_LINKER_FLAGS_INIT variable tools.build:skip_test: Do not execute CMake.test() and Meson.test() when enabled tools.build:sysroot: Pass the --sysroot= flag if available. (None by default) + tools.build:verbosity: Verbosity of MSBuild and XCodeBuild build systems. Possible values are 'quiet', 'error', 'warning', 'notice', 'status', 'verbose', 'normal', 'debug', 'v', 'trace' and 'vv' tools.cmake.cmake_layout:build_folder_vars: Settings and Options that will produce a different build folder and different CMake presets names tools.cmake.cmaketoolchain:find_package_prefer_config: Argument for the CMAKE_FIND_PACKAGE_PREFER_CONFIG tools.cmake.cmaketoolchain:generator: User defined CMake generator to use instead of default @@ -103,7 +103,6 @@ To list all the possible configurations available, run :command:`conan config li tools.microsoft.bash:subsystem: The subsystem to be used when conanfile.win_bash==True. Possible values: msys2, msys, cygwin, wsl, sfu tools.microsoft.msbuild:installation_path: VS install path, to avoid auto-detect via vswhere, like C:/Program Files (x86)/Microsoft Visual Studio/2019/Community. Use empty string to disable tools.microsoft.msbuild:max_cpu_count: Argument for the /m when running msvc to build parallel projects - tools.microsoft.msbuild:verbosity: Verbosity level for MSBuild: 'Quiet', 'Minimal', 'Normal', 'Detailed', 'Diagnostic' tools.microsoft.msbuild:vs_version: Defines the IDE version when using the new msvc compiler tools.microsoft.msbuilddeps:exclude_code_analysis: Suppress MSBuild code analysis for patterns tools.microsoft.msbuildtoolchain:compile_options: Dictionary with MSBuild compiler options @@ -123,7 +122,7 @@ Tools and user configurations can be defined in both the *global.conf* file and .. code-block:: text :caption: *global.conf* - tools.microsoft.msbuild:verbosity=Diagnostic + tools.build:verbosity=debug tools.microsoft.msbuild:max_cpu_count=2 tools.microsoft.msbuild:vs_version = 16 tools.build:jobs=10 @@ -163,7 +162,7 @@ All the values will be interpreted by Conan as the result of the python built-in .. code-block:: text # String - tools.microsoft.msbuild:verbosity=Diagnostic + tools.build:verbosity=debug # Boolean tools.system.package_manager:sudo=True # Integer diff --git a/reference/config_files/profiles.rst b/reference/config_files/profiles.rst index b8a98bbfc244..49d332d6b03a 100644 --- a/reference/config_files/profiles.rst +++ b/reference/config_files/profiles.rst @@ -413,7 +413,7 @@ List of user/tools configurations: :caption: *myprofile* [conf] - tools.microsoft.msbuild:verbosity=Diagnostic + tools.build:verbosity=debug tools.microsoft.msbuild:max_cpu_count=2 tools.microsoft.msbuild:vs_version = 16 tools.build:jobs=10 diff --git a/reference/tools/apple/xcodebuild.rst b/reference/tools/apple/xcodebuild.rst index 549e3ec39bf6..004e3a53f28e 100644 --- a/reference/tools/apple/xcodebuild.rst +++ b/reference/tools/apple/xcodebuild.rst @@ -53,7 +53,7 @@ Where: account** that for this case the skd located in that path should set your ``os.sdk`` and ``os.sdk_version`` settings values. - ``verbosity`` is the verbosity level for the build and can take value 'verbose' or - 'quiet' if set by ``tools.apple.xcodebuild:verbosity`` in your **[conf]** + 'quiet' if set by ``tools.build:verbosity`` by mapping the conf's possible values from your **[conf]** conf ++++ diff --git a/reference/tools/cmake/cmake.rst b/reference/tools/cmake/cmake.rst index 11ddeaf171fe..ec25ca1951ed 100644 --- a/reference/tools/cmake/cmake.rst +++ b/reference/tools/cmake/cmake.rst @@ -51,7 +51,7 @@ conf CMake() helper is affected by these ``[conf]`` variables: -- ``tools.microsoft.msbuild:verbosity`` will accept one of ``"Quiet", "Minimal", "Normal", "Detailed", "Diagnostic"`` to be passed +- ``tools.build:verbosity`` will accept one of ``'quiet', 'error', 'warning', 'notice', 'status', 'verbose', 'normal', 'debug', 'v', 'trace', 'vv'`` to be passed to the ``CMake.build()`` command, when a Visual Studio generator (MSBuild build system) is being used for CMake. It is passed as an argument to the underlying build system via the call ``cmake --build . --config Release -- /verbosity:Diagnostic`` diff --git a/reference/tools/microsoft/msbuild.rst b/reference/tools/microsoft/msbuild.rst index 7f34fa983488..34dcf8a1c4fa 100644 --- a/reference/tools/microsoft/msbuild.rst +++ b/reference/tools/microsoft/msbuild.rst @@ -69,7 +69,7 @@ conf ``MSBuild`` is affected by these ``[conf]`` variables: -- ``tools.microsoft.msbuild:verbosity`` accepts one of ``"Quiet", "Minimal", "Normal", "Detailed", "Diagnostic"`` to be passed +- ``tools.build:verbosity`` accepts one of ``'quiet', 'error', 'warning', 'notice', 'status', 'verbose', 'normal', 'debug', 'v', 'trace', 'vv'`` to be passed to the ``MSBuild.build()`` call as ``msbuild .... /verbosity:XXX``. - ``tools.microsoft.msbuild:max_cpu_count`` maximum number of CPUs to be passed to the ``MSBuild.build()`` call as ``msbuild .... /m:N``.