Update vcpkg baseline (Point72#209)

* update vcpkg baseline.  forced vcpkg triplet for linux to x64-linux ( was defaulting to the community x64-linux-dynamic for some reason, which fails when building boost on the latest baseline

Author: robambalu

setup.py

@@ -22,6 +22,11 @@
     # - omit coverage/gprof, not implemented
 )
 
+if sys.platform == "linux":
+    VCPKG_TRIPLET = "x64-linux"
+else:
+    VCPKG_TRIPLET = None
+
 # This will be used for e.g. the sdist
 if CSP_USE_VCPKG:
     if not os.path.exists("vcpkg"):
@@ -30,12 +35,15 @@
         subprocess.call(["git", "submodule", "update", "--init", "--recursive"])
     if not os.path.exists("vcpkg/buildtrees"):
         subprocess.call(["git", "pull"], cwd="vcpkg")
+        args = ["install"]
+        if VCPKG_TRIPLET is not None:
+            args.append(f"--triplet={VCPKG_TRIPLET}")
         if os.name == "nt":
             subprocess.call(["bootstrap-vcpkg.bat"], cwd="vcpkg", shell=True)
-            subprocess.call(["vcpkg.bat", "install"], cwd="vcpkg", shell=True)
+            subprocess.call(["vcpkg.bat"] + args, cwd="vcpkg", shell=True)
         else:
             subprocess.call(["./bootstrap-vcpkg.sh"], cwd="vcpkg")
-            subprocess.call(["./vcpkg", "install"], cwd="vcpkg")
+            subprocess.call(["./vcpkg"] + args, cwd="vcpkg")
 
 
 python_version = f"{sys.version_info.major}.{sys.version_info.minor}"
@@ -54,6 +62,9 @@
             "-DCSP_USE_VCPKG=ON",
         ]
     )
+
+    if VCPKG_TRIPLET is not None:
+        cmake_args.append( f"-DVCPKG_TARGET_TRIPLET={VCPKG_TRIPLET}" )
 else:
     cmake_args.append("-DCSP_USE_VCPKG=OFF")
 

vcpkg

@@ -1,27 +1,32 @@
 {
-    "name": "main",
-    "version-string": "latest",
-    "dependencies": [
-      "abseil",
-      "arrow",
-      "brotli",
-      "exprtk",
-      "gtest",
-        {
-            "name": "librdkafka",
-            "features": ["ssl"]
-        },
-      "lz4",
-      "openssl",
-      "parquet",
-      "protobuf",
-      "rapidjson",
-      "thrift",
-      "utf8proc",
-      "websocketpp"
-    ],
-    "overrides": [
-      { "name": "arrow", "version": "15.0.0"}
-    ],
-    "builtin-baseline": "288e8bebf4ca67c1f8ebd49366b03650cfd9eb7d"
-  }
+  "name": "main",
+  "version-string": "latest",
+  "dependencies": [
+    "abseil",
+    "arrow",
+    "brotli",
+    "exprtk",
+    "gtest",
+    {
+      "name": "librdkafka",
+      "features": [
+        "ssl"
+      ]
+    },
+    "lz4",
+    "openssl",
+    "parquet",
+    "protobuf",
+    "rapidjson",
+    "thrift",
+    "utf8proc",
+    "websocketpp"
+  ],
+  "overrides": [
+    {
+      "name": "arrow",
+      "version": "15.0.0"
+    }
+  ],
+  "builtin-baseline": "04b0cf2b3fd1752d3c3db969cbc10ba0a4613cee"
+}