Merge pull request #219 from stotiks/mmx_pos_msvc

mmx_pos msvc
madMAx43v3r · Nov 20, 2023 · 02904e3 · 02904e3
2 parents b92650a + dda6c52
commit 02904e3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,8 +14,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  VCPKG_COMMIT_ID: "501db0f17ef6df184fcdbfbe0f87cde2313b6ab1"
-  CMAKE_BUILD_PRESET: "windows-release"
+  VCPKG_COMMIT_ID: "9edb1b8e590cc086563301d735cae4b6e732d2d2"
+  CMAKE_BUILD_PRESET: "gha-windows-release"
   MMX_VERSION: ${{ github.ref_name }}
   MMX_WIN_PACK: "TRUE"
   MMX_GIGAHORSE: "FALSE"
@@ -36,7 +36,7 @@ jobs:
       - uses: lukka/get-cmake@latest
 
       - name: Restore artifacts, or setup vcpkg (do not install any package)
-        uses: lukka/run-vcpkg@v10
+        uses: lukka/run-vcpkg@v11
         with:
           vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -251,6 +251,7 @@ if(MSVC)
 	GENERATE_EXPORT_HEADER(mmx_iface)
 	GENERATE_EXPORT_HEADER(mmx_modules)
 	GENERATE_EXPORT_HEADER(mmx_db)
+	GENERATE_EXPORT_HEADER(mmx_pos)
 	GENERATE_EXPORT_HEADER(mmx_vm)
 
 	set_target_properties(mmx_iface PROPERTIES ENABLE_EXPORTS 1)
@@ -262,6 +263,7 @@ if(MSVC)
 	set_target_properties(mmx_modules PROPERTIES LINK_OPTIONS "/NODEFAULTLIB:LIBCMT")
 
 	set_target_properties(mmx_vm PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS 1)
+	set_target_properties(mmx_pos PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS 1)
 	set_target_properties(mmx_db PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS 1)
 
 	# Workaround for:

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -42,6 +42,16 @@
             }
         },
 
+        {
+            "name": "gha-windows-release",
+            "displayName": "GHA Windows x64 Release",
+            "description": "Sets Visual Studio generator, build directory",
+            "inherits": "windows-release",
+            "environment": {
+                "VCPKG_ROOT": "./vcpkg"
+            }
+        },        
+
         {
             "name": "windows-debug",
             "displayName": "Windows x64 Debug",
@@ -55,6 +65,11 @@
     ],
 
     "buildPresets": [
+        {
+            "name": "gha-windows-release",
+            "configurePreset": "gha-windows-release",
+            "configuration": "Release"
+        },
         {
             "name": "windows-release",
             "configurePreset": "windows-release",

diff --git a/vcpkg.json b/vcpkg.json
@@ -9,6 +9,7 @@
     ],
     "builtin-baseline":"acc3bcf76b84ae5041c86ab55fe138ae7b8255c7",
     "overrides": [
-        { "name": "secp256k1", "version": "2017-19-10#4" }
+        { "name": "secp256k1", "version": "2017-19-10#4" },
+        { "name": "gmp", "version": "6.2.1", "port-version": 20}
     ]
 }