Feature/msvc

conan/tools/cmake/generic.py

@@ -42,7 +42,7 @@ def get_generator_platform(settings, generator):
     if settings.get_safe("os") == "WindowsCE":
         return settings.get_safe("os.platform")
 
-    if (compiler == "Visual Studio" or compiler_base == "Visual Studio") and \
+    if (compiler in ("Visual Studio", "msvc") or compiler_base == "Visual Studio") and \
             generator and "Visual" in generator:
         return {"x86": "Win32",
                 "x86_64": "x64",
@@ -213,6 +213,12 @@ def _runtimes(self):
                                        "MTd": "MultiThreadedDebug",
                                        "MD": "MultiThreadedDLL",
                                        "MDd": "MultiThreadedDebugDLL"}[runtime]
+        if compiler == "msvc":
+            runtime_type = settings.get_safe("compiler.runtime_type")
+            rt = "MultiThreadedDebug" if runtime_type == "Debug" else "MultiThreaded"
+            if runtime != "static":
+                rt += "DLL"
+            config_dict[build_type] = rt
         return config_dict
 
     def _get_libcxx(self):

conan/tools/cmake/utils.py

@@ -48,6 +48,15 @@ def get_generator(conanfile):
 
     compiler = conanfile.settings.get_safe("compiler")
     compiler_version = conanfile.settings.get_safe("compiler.version")
+
+    if compiler == "msvc":
+        version = compiler_version[:4]  # Remove the latest version number 19.1X if existing
+        _visuals = {'19.0': '14 2015',
+                    '19.1': '15 2017',
+                    '19.2': '16 2019'}[version]
+        base = "Visual Studio %s" % _visuals
+        return base
+
     compiler_base = conanfile.settings.get_safe("compiler.base")
     arch = conanfile.settings.get_safe("arch")
 

conan/tools/microsoft/__init__.py

@@ -2,3 +2,17 @@
 from .toolchain import MSBuildToolchain
 from .msbuild import MSBuild
 from .msbuilddeps import MSBuildDeps
+
+
+def msvc_runtime_flag(conanfile):
+    settings = conanfile.settings
+    compiler = settings.get_safe("compiler")
+    runtime = settings.get_safe("compiler.runtime")
+    if compiler == "Visual Studio":
+        return runtime
+    if compiler == "msvc":
+        runtime_type = settings.get_safe("compiler.runtime_type")
+        if runtime == "static":
+            return "MTd" if runtime_type == "Debug" else "MT"
+        else:
+            return "MDd" if runtime_type == "Debug" else "MD"

conans/client/conf/__init__.py

@@ -71,6 +71,13 @@
             threads: [None, posix, win32] #  Windows MinGW
             exception: [None, dwarf2, sjlj, seh] # Windows MinGW
             cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]
+        msvc:
+            version: ["19.0",
+                      "19.1", "19.10", "19.11", "19.12", "19.13", "19.14", "19.15", "19.16",
+                      "19.2", "19.20", "19.21", "19.22", "19.23", "19.24", "19.25", "19.26", "19.27", "19.28"]
+            runtime: [static, dynamic]
+            runtime_type: [Debug, Release]
+            cppstd: [None, 14, 17, 20]
         Visual Studio: &visual_studio
             runtime: [MD, MT, MTd, MDd]
             version: ["8", "9", "10", "11", "12", "14", "15", "16"]
@@ -485,6 +492,14 @@ def full_transitive_package_id(self):
         except ConanException:
             return None
 
+    @property
+    def msvc_visual_incompatible(self):
+        try:
+            visual_comp = self.get_item("general.msvc_visual_incompatible")
+            return visual_comp.lower() in ("1", "true")
+        except ConanException:
+            return None
+
     @property
     def short_paths_home(self):
         short_paths_home = get_env("CONAN_USER_HOME_SHORT")

conans/client/graph/graph_binaries.py

@@ -339,6 +339,10 @@ def _compute_package_id(self, node, default_package_id_mode, default_python_requ
                                           python_requires=python_requires,
                                           default_python_requires_id_mode=
                                           default_python_requires_id_mode)
+        if not self._cache.config.msvc_visual_incompatible:
+            msvc_compatible = conanfile.info.msvc_compatible()
+            if msvc_compatible:
+                conanfile.compatible_packages.append(msvc_compatible)
 
         # Once we are done, call package_id() to narrow and change possible values
         with conanfile_exception_formatter(str(conanfile), "package_id"):

conans/client/migrations_settings.py

@@ -1820,4 +1820,109 @@
 settings_1_32_0 = settings_1_31_4
 settings_1_32_1 = settings_1_32_0
 
-settings_1_33_0 = settings_1_32_1
+settings_1_33_0 = """
+# Only for cross building, 'os_build/arch_build' is the system that runs Conan
+os_build: [Windows, WindowsStore, Linux, Macos, FreeBSD, SunOS, AIX]
+arch_build: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, sh4le]
+
+# Only for building cross compilation tools, 'os_target/arch_target' is the system for
+# which the tools generate code
+os_target: [Windows, Linux, Macos, Android, iOS, watchOS, tvOS, FreeBSD, SunOS, AIX, Arduino, Neutrino]
+arch_target: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le]
+
+# Rest of the settings are "host" settings:
+# - For native building/cross building: Where the library/program will run.
+# - For building cross compilation tools: Where the cross compiler will run.
+os:
+    Windows:
+        subsystem: [None, cygwin, msys, msys2, wsl]
+    WindowsStore:
+        version: ["8.1", "10.0"]
+    WindowsCE:
+        platform: ANY
+        version: ["5.0", "6.0", "7.0", "8.0"]
+    Linux:
+    Macos:
+        version: [None, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15", "11.0"]
+    Android:
+        api_level: ANY
+    iOS:
+        version: ["7.0", "7.1", "8.0", "8.1", "8.2", "8.3", "9.0", "9.1", "9.2", "9.3", "10.0", "10.1", "10.2", "10.3", "11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6"]
+    watchOS:
+        version: ["4.0", "4.1", "4.2", "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1"]
+    tvOS:
+        version: ["11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0"]
+    FreeBSD:
+    SunOS:
+    AIX:
+    Arduino:
+        board: ANY
+    Emscripten:
+    Neutrino:
+        version: ["6.4", "6.5", "6.6", "7.0", "7.1"]
+arch: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv4, armv4i, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le]
+compiler:
+    sun-cc:
+        version: ["5.10", "5.11", "5.12", "5.13", "5.14", "5.15"]
+        threads: [None, posix]
+        libcxx: [libCstd, libstdcxx, libstlport, libstdc++]
+    gcc: &gcc
+        version: ["4.1", "4.4", "4.5", "4.6", "4.7", "4.8", "4.9",
+                  "5", "5.1", "5.2", "5.3", "5.4", "5.5",
+                  "6", "6.1", "6.2", "6.3", "6.4", "6.5",
+                  "7", "7.1", "7.2", "7.3", "7.4", "7.5",
+                  "8", "8.1", "8.2", "8.3", "8.4",
+                  "9", "9.1", "9.2", "9.3",
+                  "10", "10.1"]
+        libcxx: [libstdc++, libstdc++11]
+        threads: [None, posix, win32] #  Windows MinGW
+        exception: [None, dwarf2, sjlj, seh] # Windows MinGW
+        cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]
+    msvc:
+        version: ["19.0",
+                  "19.1", "19.10", "19.11", "19.12", "19.13", "19.14", "19.15", "19.16",
+                  "19.2", "19.20", "19.21", "19.22", "19.23", "19.24", "19.25", "19.26", "19.27", "19.28"]
+        runtime: [static, dynamic]
+        runtime_type: [Debug, Release]
+        cppstd: [None, 14, 17, 20]
+    Visual Studio: &visual_studio
+        runtime: [MD, MT, MTd, MDd]
+        version: ["8", "9", "10", "11", "12", "14", "15", "16"]
+        toolset: [None, v90, v100, v110, v110_xp, v120, v120_xp,
+                  v140, v140_xp, v140_clang_c2, LLVM-vs2012, LLVM-vs2012_xp,
+                  LLVM-vs2013, LLVM-vs2013_xp, LLVM-vs2014, LLVM-vs2014_xp,
+                  LLVM-vs2017, LLVM-vs2017_xp, v141, v141_xp, v141_clang_c2, v142,
+                  llvm, ClangCL]
+        cppstd: [None, 14, 17, 20]
+    clang:
+        version: ["3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0",
+                  "5.0", "6.0", "7.0", "7.1",
+                  "8", "9", "10", "11"]
+        libcxx: [None, libstdc++, libstdc++11, libc++, c++_shared, c++_static]
+        cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]
+        runtime: [None, MD, MT, MTd, MDd]
+    apple-clang: &apple_clang
+        version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1", "10.0", "11.0", "12.0"]
+        libcxx: [libstdc++, libc++]
+        cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]
+    intel:
+        version: ["11", "12", "13", "14", "15", "16", "17", "18", "19", "19.1"]
+        base:
+            gcc:
+                <<: *gcc
+                threads: [None]
+                exception: [None]
+            Visual Studio:
+                <<: *visual_studio
+            apple-clang:
+                <<: *apple_clang
+    qcc:
+        version: ["4.4", "5.4", "8.3"]
+        libcxx: [cxx, gpp, cpp, cpp-ne, accp, acpp-ne, ecpp, ecpp-ne]
+        cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17]
+
+build_type: [None, Debug, Release, RelWithDebInfo, MinSizeRel]
+
+
+cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]  # Deprecated, use compiler.cppstd
+"""

conans/client/settings_preprocessor.py

@@ -61,6 +61,10 @@ def _fill_runtime(settings):
                 settings.compiler.base.runtime = runtime
                 msg = "Setting 'compiler.base.runtime' not declared, automatically adjusted to '%s'"
                 logger.info(msg % runtime)
+        elif settings.compiler == "msvc":
+            if settings.get_safe("compiler.runtime_type") is None:
+                runtime = "Debug" if settings.get_safe("build_type") == "Debug" else "Release"
+                settings.compiler.runtime_type = runtime
     except Exception:  # If the settings structure doesn't match these general
         # asumptions, like unexistant runtime
         pass

conans/model/info.py

@@ -575,6 +575,27 @@ def header_only(self):
         self.options.clear()
         self.requires.clear()
 
+    def msvc_compatible(self):
+        if self.settings.compiler != "msvc":
+            return
+
+        compatible = self.clone()
+        version = compatible.settings.compiler.version
+        runtime = compatible.settings.compiler.runtime
+        runtime_type = compatible.settings.compiler.runtime_type
+
+        compatible.settings.compiler = "Visual Studio"
+        version = str(version)[:4]
+        _visuals = {'19.0': '14',
+                    '19.1': '15',
+                    '19.2': '16'}
+        compatible.settings.compiler.version = _visuals[version]
+        runtime = "MT" if runtime == "static" else "MD"
+        if  runtime_type == "Debug":
+            runtime = "{}d".format(runtime)
+        compatible.settings.compiler.runtime = runtime
+        return compatible
+
     def vs_toolset_compatible(self):
         """Default behaviour, same package for toolset v140 with compiler=Visual Studio 15 than
         using Visual Studio 14"""

conans/test/functional/toolchains/test_cmake.py

@@ -163,7 +163,9 @@ def _run_app(self, build_type, bin_folder=False, msg="App", dyld_path=None):
 @pytest.mark.skipif(platform.system() != "Windows", reason="Only for windows")
 class WinTest(Base):
     @parameterized.expand([("Visual Studio", "Debug", "MTd", "15", "14", "x86", "v140", True),
-                           ("Visual Studio", "Release", "MD", "15", "17", "x86_64", "", False)]
+                           ("Visual Studio", "Release", "MD", "15", "17", "x86_64", "", False),
+                           ("msvc", "Debug", "static", "19.1", "14", "x86", None, True),
+                           ("msvc", "Release", "dynamic", "19.11", "17", "x86_64", None, False)]
                           )
     def test_toolchain_win(self, compiler, build_type, runtime, version, cppstd, arch, toolset,
                            shared):
@@ -230,7 +232,7 @@ def _verify_out(marker=">>"):
         self._run_app("Debug", bin_folder=True)
         check_msc_ver(toolset or "v141", self.client.out)
         self.assertIn("main _MSVC_LANG20{}".format(cppstd), self.client.out)
-        static = "MT" in runtime
+        static = (runtime == "static" or "MT" in runtime)
         check_vs_runtime("build/Release/app.exe", self.client, "15", build_type="Release",
                          static=static)
         check_vs_runtime("build/Debug/app.exe", self.client, "15", build_type="Debug",

conans/test/functional/toolchains/test_msbuild.py

@@ -219,6 +219,28 @@
 """
 
 
+@pytest.mark.tool_visual_studio
+def test_msvc_runtime_flag():
+    client = TestClient()
+    conanfile = textwrap.dedent("""
+       from conans import ConanFile
+       from conan.tools.microsoft import msvc_runtime_flag
+       class App(ConanFile):
+           settings = "os", "arch", "compiler", "build_type"
+
+           def generate(self):
+               self.output.info("MSVC FLAG={}!!".format(msvc_runtime_flag(self)))
+        """)
+    client.save({"conanfile.py": conanfile})
+    client.run('install . -s compiler="Visual Studio" -s compiler.version=15 -s compiler.runtime=MD')
+    assert "MSVC FLAG=MD!!" in client.out
+    client.run('install . -s compiler=msvc -s compiler.version=19.1 -s compiler.runtime=static '
+               '-s compiler.runtime_type=Debug')
+    assert "MSVC FLAG=MTd!!" in client.out
+    client.run('install . -s compiler=msvc -s compiler.version=19.1 -s compiler.runtime=dynamic')
+    assert "MSVC FLAG=MD!!" in client.out
+
+
 @pytest.mark.skipif(platform.system() != "Windows", reason="Only for windows")
 @pytest.mark.tool_visual_studio
 class WinTest(unittest.TestCase):

conans/test/integration/package_id/compatible_test.py

@@ -492,3 +492,18 @@ def package_id(self):
         self.assertIn("pkg/0.1@user/testing:1ebf4db7209535776307f9cd06e00d5a8034bc84 - Cache",
                       client.out)
         self.assertIn("pkg/0.1@user/testing: Already installed!", client.out)
+
+
+def test_msvc_visual_incompatible():
+    conanfile = GenConanfile().with_settings("os", "compiler", "build_type", "arch")
+    client = TestClient()
+    client.save({"conanfile.py": conanfile})
+    client.run('create . pkg/0.1@ -s os=Windows -s compiler="Visual Studio" -s compiler.version=15 '
+               '-s compiler.runtime=MD -s build_type=Release -s arch=x86_64')
+    client.run("install pkg/0.1@  -s os=Windows -s compiler=msvc -s compiler.version=19.1 "
+               "-s compiler.runtime=dynamic -s build_type=Release -s arch=x86_64")
+    assert "Using compatible package" in client.out
+    client.run("config set general.msvc_visual_incompatible=1")
+    client.run("install pkg/0.1@  -s os=Windows -s compiler=msvc -s compiler.version=19.1 "
+               "-s compiler.runtime=dynamic -s build_type=Release -s arch=x86_64", assert_error=True)
+    assert "ERROR: Missing prebuilt package for 'pkg/0.1'" in client.out