WIP

Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Feb 27, 2024 · 7cf1e1f · 7cf1e1f
1 parent fb8d2d1
commit 7cf1e1f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 11 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -75,12 +75,28 @@
                 "relwithdebinfo"
             ]
         },
+        {
+            "name": "windows",
+            "cacheVariables": {
+                "USE_OPTIONAL":"OFF",
+                "CLIENTTOOLS_ONLY":"ON",
+                "USE_AZURE": "OFF",
+                "USE_CASSANDRA": "OFF",
+                "USE_JAVA": "OFF",
+                "USE_OPENLDAP": "OFF"
+            },
+            "hidden": true
+        },
         {
             "name": "VS-16",
             "generator": "Visual Studio 16 2019",
             "architecture": {
                 "strategy": "set",
-                "value": "Win32"
+                "value": "x64"
+            },
+            "toolset": {
+                "strategy": "set",
+                "value": "host=x64"
             },
             "hidden": true
         },
@@ -95,27 +111,21 @@
                 "strategy": "set",
                 "value": "host=x64"
             },
-            "cacheVariables": {
-                "USE_OPTIONAL":"OFF",
-                "CLIENTTOOLS_ONLY":"ON",
-                "USE_AZURE": "OFF",
-                "USE_CASSANDRA": "OFF",
-                "USE_JAVA": "OFF",
-                "USE_OPENLDAP": "OFF"
-            },
             "hidden": true
         },
         {
             "name": "vcpkg-VS-16",
             "inherits": [
                 "vcpkg",
+                "windows",
                 "VS-16"
             ]
         },
         {
             "name": "vcpkg-VS-17",
             "inherits": [
                 "vcpkg",
+                "windows",
                 "VS-17"
             ]
         }
@@ -145,6 +155,16 @@
             "name": "VS-16-Debug",
             "configurePreset": "vcpkg-VS-16",
             "configuration": "Debug",
+            "jobs": 0,
+            "nativeToolOptions": [
+                "-m"
+            ]
+        },
+        {
+            "name": "VS-16-Release",
+            "configurePreset": "vcpkg-VS-16",
+            "configuration": "Release",
+            "jobs": 0,
             "nativeToolOptions": [
                 "-m"
             ]
@@ -153,12 +173,16 @@
             "name": "VS-17-Debug",
             "configurePreset": "vcpkg-VS-17",
             "configuration": "Debug",
-            "jobs": 0
+            "jobs": 0,
+            "nativeToolOptions": [
+                "-m"
+            ]
         },
         {
             "name": "VS-17-Release",
             "configurePreset": "vcpkg-VS-17",
             "configuration": "Release",
+            "jobs": 0,
             "nativeToolOptions": [
                 "-m"
             ]
@@ -167,6 +191,7 @@
             "name": "VS-17-RelWithDebInfo",
             "configurePreset": "vcpkg-VS-17",
             "configuration": "RelWithDebInfo",
+            "jobs": 0,
             "nativeToolOptions": [
                 "-m"
             ]

diff --git a/system/jlib/CMakeLists.txt b/system/jlib/CMakeLists.txt
@@ -280,7 +280,7 @@ target_link_libraries ( jlib ZLIB::ZLIB )
 endif (WIN32 AND USE_ZLIB)
 
 if (WIN32)
- target_link_libraries ( jlib ws2_32 mpr.lib Winmm.lib psapi.lib )
+ target_link_libraries ( jlib ws2_32 mpr.lib Winmm.lib psapi.lib kernel32.lib )
 elseif (("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" ))
 else ()
  target_link_libraries ( jlib rt )