Temporarily remove the crt-linkage and library-linkage options

These require a lot more work to integrate properly with vcpkg, reimplement triplet detection and set a custom triplet

Author: mrexodia

docs/cmake-toml.md

@@ -97,16 +97,12 @@ include-after = ["cmake/after-subdir.cmake"]
 version = "2021.05.12"
 url = "https://github.com/microsoft/vcpkg/archive/refs/tags/2021.05.12.tar.gz"
 packages = ["fmt", "zlib"]
-crt-linkage = "dynamic"
-library-linkage = "dynamic"
 ```
 
 The vcpkg `version` will automatically generate the `url` from the [official repository](https://github.com/microsoft/vcpkg/releases). For a custom registry you can specify your own `url` (and omit the `version`). You can browse available packages on [vcpkg.io](https://vcpkg.io/en/packages.html).
 
 To specify package features you can use the following syntax: `imgui[docking-experimental,freetype,sdl2-binding,opengl3-binding]`.
 
-The `crt-linkage` specifies the MSVC runtime library variant to use while compiling packages. `library-linkage` is whether libraries built are dynamic (default) or static.
-
 ## Packages
 
 ```toml

docs/examples/vcpkg.md

@@ -21,8 +21,6 @@ description = "Dependencies from vcpkg"
 [vcpkg]
 version = "2021.05.12"
 packages = ["fmt"]
-crt-linkage = "dynamic"
-library-linkage = "dynamic"
 
 [find-package]
 fmt = {}

include/project_parser.hpp

@@ -39,8 +39,6 @@ struct Package {
 struct Vcpkg {
     std::string version;
     std::string url;
-    std::string crt_linkage;
-    std::string library_linkage;
 
     struct Package {
         std::string name;

src/cmake_generator.cpp

@@ -638,12 +638,6 @@ void generate_cmake(const char *path, const parser::Project *parent_project) {
             cmd("FetchContent_GetProperties")("vcpkg");
             cmd("if")("NOT", "vcpkg_POPULATED");
                 cmd("FetchContent_Populate")("vcpkg");
-                if (!project.vcpkg.crt_linkage.empty()) {
-                    cmd("set")("VCPKG_CRT_LINKAGE", project.vcpkg.crt_linkage);
-                }
-                if (!project.vcpkg.library_linkage.empty()) {
-                    cmd("set")("VCPKG_LIBRARY_LINKAGE", project.vcpkg.library_linkage);
-                }
                 cmd("include")("${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake");
             cmd("endif")();
         cmd("endif")();

src/project_parser.cpp

@@ -628,18 +628,6 @@ Project::Project(const Project *parent, const std::string &path, bool build) {
         v.optional("url", vcpkg.url);
         v.optional("version", vcpkg.version);
 
-        auto handle_linkage = [&v](const toml::key &ky, std::string &value) {
-            if (v.contains(ky)) {
-                v.required(ky, value);
-                if (value != "dynamic" && value != "static") {
-                    throw std::runtime_error(format_key_error("Unknown linkage, expected dynamic/static", value, v.find(ky)));
-                }
-            }
-        };
-
-        handle_linkage("crt-linkage", vcpkg.crt_linkage);
-        handle_linkage("library-linkage", vcpkg.library_linkage);
-
         for (const auto &p : v.find("packages").as_array()) {
             Vcpkg::Package package;
             const auto &package_str = p.as_string().str;

tests/vcpkg/cmake.toml

@@ -9,8 +9,6 @@ description = "Dependencies from vcpkg"
 [vcpkg]
 version = "2021.05.12"
 packages = ["fmt"]
-crt-linkage = "dynamic"
-library-linkage = "dynamic"
 
 [find-package]
 fmt = {}