Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cmake::msbuild_verbosity can be avoided in the command line #5220

Merged
merged 1 commit into from
May 27, 2019
Merged

Cmake::msbuild_verbosity can be avoided in the command line #5220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions conans/client/build/cmake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class CMake(object):

def __init__(self, conanfile, generator=None, cmake_system_name=True,
parallel=True, build_type=None, toolset=None, make_program=None,
set_cmake_flags=False, msbuild_verbosity=None, cmake_program=None,
set_cmake_flags=False, msbuild_verbosity="minimal", cmake_program=None,
generator_platform=None):
"""
:param conanfile: Conanfile instance
Expand Down Expand Up @@ -69,8 +69,7 @@ def __init__(self, conanfile, generator=None, cmake_system_name=True,
self.definitions = builder.get_definitions()
self.toolset = toolset or get_toolset(self._settings)
self.build_dir = None
self.msbuild_verbosity = (os.getenv("CONAN_MSBUILD_VERBOSITY") or msbuild_verbosity or
"minimal")
self.msbuild_verbosity = os.getenv("CONAN_MSBUILD_VERBOSITY") or msbuild_verbosity

@property
def build_folder(self):
Expand Down
4 changes: 4 additions & 0 deletions conans/test/unittests/client/build/cmake_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,6 +1333,10 @@ def test_msbuild_verbosity(self):
cmake.build()
self.assertIn("/verbosity:quiet", conan_file.command)

cmake = CMake(conan_file, msbuild_verbosity=None)
cmake.build()
self.assertNotIn("/verbosity", conan_file.command)

with tools.environment_append({"CONAN_MSBUILD_VERBOSITY": "detailed"}):
cmake = CMake(conan_file)
cmake.build()
Expand Down