Skip to content

Commit 335b8ed

Browse files
committed
cpack win 64
1 parent daa3e05 commit 335b8ed

File tree

2,635 files changed

+143955
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,635 files changed

+143955
-11
lines changed

.github/workflows/release-cpack.yml

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ jobs:
2020
cmake --build build -j2
2121
cd build && cpack
2222
23-
# cmake -B build \
24-
# -DCMAKE_BUILD_TYPE=Release \
25-
# -DBUILD_SHARED_LIBS=OFF \
26-
# -DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc -static-libstdc++" \
27-
# .
28-
2923
- name: Upload artifacts
3024
uses: actions/upload-artifact@v4
3125
with:
@@ -57,7 +51,7 @@ jobs:
5751
runs-on: windows-latest
5852
strategy:
5953
matrix:
60-
arch: [x64, Win32]
54+
arch: [x64]
6155
steps:
6256
- uses: actions/checkout@v3
6357
- name: Build
@@ -67,23 +61,77 @@ jobs:
6761
cmake --build build --config Release --parallel
6862
cd build
6963
cpack -C Release
64+
65+
# -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL
66+
# Win32
67+
7068
- name: Upload artifacts
7169
uses: actions/upload-artifact@v4
7270
with:
7371
name: windows-${{ matrix.arch }}
7472
path: build/*.zip
7573

74+
# build-windows-32:
75+
# runs-on: windows-latest
76+
# strategy:
77+
# fail-fast: false
78+
# matrix:
79+
# arch: [Win32]
80+
# steps:
81+
# - uses: actions/checkout@v3
82+
# - name: Build
83+
# run: |
84+
# cmake -B build -G "Visual Studio 17 2022" -A ${{ matrix.arch }} `
85+
# -DHIPO=ON -DBUILD_OPENBLAS=ON -DBUILD_STATIC_EXE=ON `
86+
# -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL
87+
# cmake --build build --config Release --parallel
88+
# cd build
89+
# cpack -C Release
90+
91+
# # -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL
92+
# # Win32
93+
94+
# - name: Upload artifacts
95+
# uses: actions/upload-artifact@v4
96+
# with:
97+
# name: windows-${{ matrix.arch }}
98+
# path: build/*.zip
99+
100+
# build-windows-arm-32:
101+
# runs-on: windows-11-arm
102+
# strategy:
103+
# matrix:
104+
# arch: [ARM]
105+
# steps:
106+
# - uses: actions/checkout@v3
107+
# - name: Build
108+
# run: |
109+
# cmake -B build -G "Visual Studio 17 2022" -A ${{ matrix.arch }} `
110+
# -DHIPO=ON -DBUILD_OPENBLAS=ON -DBUILD_STATIC_EXE=ON `
111+
# -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL `
112+
# -DCMAKE_VS_WINDOWS_SDK_VERSION=10.0.20348.0
113+
# cmake --build build --config Release --parallel
114+
# cd build
115+
# cpack -C Release
116+
117+
# - name: Upload artifacts
118+
# uses: actions/upload-artifact@v4
119+
# with:
120+
# name: windows-${{ matrix.arch }}
121+
# path: build/*.zip
122+
76123
build-windows-arm:
77124
runs-on: windows-11-arm
78125
strategy:
79126
matrix:
80-
arch: [ARM, ARM64]
127+
arch: [ARM64]
81128
steps:
82129
- uses: actions/checkout@v3
83130
- name: Build
84131
run: |
85132
cmake -B build -G "Visual Studio 17 2022" -A ${{ matrix.arch }} `
86-
-DHIPO=ON -DBUILD_OPENBLAS=ON -DBUILD_STATIC_EXE=ON
133+
-DHIPO=ON -DBUILD_OPENBLAS=ON -DBUILD_STATIC_EXE=ON `
134+
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL
87135
cmake --build build --config Release --parallel
88136
cd build
89137
cpack -C Release

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,10 @@ if(MSVC)
506506
# add_compile_options("/Z7")
507507
# add_link_options("/DEBUG:FASTLINK")
508508

509-
add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:/Z7>")
510-
add_link_options("$<$<COMPILE_LANGUAGE:C,CXX>:/DEBUG:FASTLINK>")
509+
if (NOT BUILD_STATIC_EXE)
510+
add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:/Z7>")
511+
add_link_options("$<$<COMPILE_LANGUAGE:C,CXX>:/DEBUG:FASTLINK>")
512+
endif()
511513

512514
if(STDCALL)
513515
# /Gz - stdcall calling convention

HiGHS.sln

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.5.2.0
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{2A18E756-48A1-E247-9A68-57B5E8CBE245}"
6+
EndProject
7+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Highs", "nuget\Highs.csproj", "{906CCF22-9F98-849C-F4C4-760DF67E239A}"
8+
EndProject
9+
Global
10+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
11+
Debug|Any CPU = Debug|Any CPU
12+
Release|Any CPU = Release|Any CPU
13+
EndGlobalSection
14+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
15+
{906CCF22-9F98-849C-F4C4-760DF67E239A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16+
{906CCF22-9F98-849C-F4C4-760DF67E239A}.Debug|Any CPU.Build.0 = Debug|Any CPU
17+
{906CCF22-9F98-849C-F4C4-760DF67E239A}.Release|Any CPU.ActiveCfg = Release|Any CPU
18+
{906CCF22-9F98-849C-F4C4-760DF67E239A}.Release|Any CPU.Build.0 = Release|Any CPU
19+
EndGlobalSection
20+
GlobalSection(SolutionProperties) = preSolution
21+
HideSolutionNode = FALSE
22+
EndGlobalSection
23+
GlobalSection(NestedProjects) = preSolution
24+
{906CCF22-9F98-849C-F4C4-760DF67E239A} = {2A18E756-48A1-E247-9A68-57B5E8CBE245}
25+
EndGlobalSection
26+
GlobalSection(ExtensibilityGlobals) = postSolution
27+
SolutionGuid = {B7748E81-D6DE-4DE1-8E96-9F5F11D81DCD}
28+
EndGlobalSection
29+
EndGlobal

build-32/ALL_BUILD.vcxproj

Lines changed: 305 additions & 0 deletions
Large diffs are not rendered by default.

build-32/ALL_BUILD.vcxproj.filters

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<CustomBuild Include="C:\Users\galab\code\HiGHS\CMakeLists.txt" />
5+
</ItemGroup>
6+
<ItemGroup>
7+
</ItemGroup>
8+
</Project>

0 commit comments

Comments
 (0)