-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add VS2022 and its windows-ci to stable 0.60
Add configall_system files from master.
- Loading branch information
1 parent
f9a978b
commit add48cc
Showing
8 changed files
with
755 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| # Ignore VS files | ||
| *.suo | ||
| *.db | ||
| *.bak | ||
| *.user | ||
| **/.vs/ | ||
| **/MSVisualStudio/**/Release/ | ||
| **/MSVisualStudio/**/ReleaseParallel/ | ||
| **/MSVisualStudio/**/Debug/ | ||
|
|
||
| # Ignore files created during unit tests | ||
| **/MSVisualStudio/**/*.mps | ||
| **/MSVisualStudio/**/*.lp | ||
| **/MSVisualStudio/**/*.out |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
|
|
||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio Version 17 | ||
| VisualStudioVersion = 17.3.32804.467 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCgl", "libCgl\libCgl.vcxproj", "{1E645A44-00EF-4093-9F6A-1D082BD43BDB}" | ||
| EndProject | ||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CglUnitTest", "CglUnitTest\CglUnitTest.vcxproj", "{FCF90EF8-93AE-482A-9B55-018B8338B99D}" | ||
| EndProject | ||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libClp", "..\..\..\..\Clp\Clp\MSVisualStudio\v17\libClp\libClp.vcxproj", "{768B67D6-E6D3-4A8F-AA61-511FDBCE7937}" | ||
| EndProject | ||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsiClp", "..\..\..\..\Clp\Clp\MSVisualStudio\v17\libOsiClp\libOsiClp.vcxproj", "{79433425-EC16-410F-9B91-8D31D2109C90}" | ||
| EndProject | ||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCoinUtils", "..\..\..\..\CoinUtils\CoinUtils\MSVisualStudio\v17\libCoinUtils\libCoinUtils.vcxproj", "{6D2EF92A-D693-47E3-A325-A686E78C5FFD}" | ||
| EndProject | ||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsi", "..\..\..\..\Osi\Osi\MSVisualStudio\v17\libOsi\libOsi.vcxproj", "{BF5C7532-EE0A-479B-9993-72134087D530}" | ||
| EndProject | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{657AF492-1E1A-430A-96AF-93039CF6F2E5}" | ||
| ProjectSection(SolutionItems) = preProject | ||
| ..\..\..\.gitignore = ..\..\..\.gitignore | ||
| ..\..\..\AUTHORS = ..\..\..\AUTHORS | ||
| ..\..\..\LICENSE = ..\..\..\LICENSE | ||
| ..\..\..\README.md = ..\..\..\README.md | ||
| EndProjectSection | ||
| EndProject | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{FA2B8E71-DD6B-4A8D-8052-69AB758A1144}" | ||
| ProjectSection(SolutionItems) = preProject | ||
| ..\..\..\.github\workflows\linux-ci.yml = ..\..\..\.github\workflows\linux-ci.yml | ||
| ..\..\..\.github\workflows\release.yml = ..\..\..\.github\workflows\release.yml | ||
| ..\..\..\.github\workflows\windows-ci.yml = ..\..\..\.github\workflows\windows-ci.yml | ||
| EndProjectSection | ||
| EndProject | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{14BDCE3D-C9CE-4739-9A78-C3BE5FD99887}" | ||
| ProjectSection(SolutionItems) = preProject | ||
| CglTest.cmd = CglTest.cmd | ||
| EndProjectSection | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|x64 = Debug|x64 | ||
| Debug|x86 = Debug|x86 | ||
| Release|x64 = Release|x64 | ||
| Release|x86 = Release|x86 | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {1E645A44-00EF-4093-9F6A-1D082BD43BDB}.Debug|x64.ActiveCfg = Debug|x64 | ||
| {1E645A44-00EF-4093-9F6A-1D082BD43BDB}.Debug|x64.Build.0 = Debug|x64 | ||
| {1E645A44-00EF-4093-9F6A-1D082BD43BDB}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| {1E645A44-00EF-4093-9F6A-1D082BD43BDB}.Debug|x86.Build.0 = Debug|Win32 | ||
| {1E645A44-00EF-4093-9F6A-1D082BD43BDB}.Release|x64.ActiveCfg = Release|x64 | ||
| {1E645A44-00EF-4093-9F6A-1D082BD43BDB}.Release|x64.Build.0 = Release|x64 | ||
| {1E645A44-00EF-4093-9F6A-1D082BD43BDB}.Release|x86.ActiveCfg = Release|Win32 | ||
| {1E645A44-00EF-4093-9F6A-1D082BD43BDB}.Release|x86.Build.0 = Release|Win32 | ||
| {FCF90EF8-93AE-482A-9B55-018B8338B99D}.Debug|x64.ActiveCfg = Debug|x64 | ||
| {FCF90EF8-93AE-482A-9B55-018B8338B99D}.Debug|x64.Build.0 = Debug|x64 | ||
| {FCF90EF8-93AE-482A-9B55-018B8338B99D}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| {FCF90EF8-93AE-482A-9B55-018B8338B99D}.Debug|x86.Build.0 = Debug|Win32 | ||
| {FCF90EF8-93AE-482A-9B55-018B8338B99D}.Release|x64.ActiveCfg = Release|x64 | ||
| {FCF90EF8-93AE-482A-9B55-018B8338B99D}.Release|x64.Build.0 = Release|x64 | ||
| {FCF90EF8-93AE-482A-9B55-018B8338B99D}.Release|x86.ActiveCfg = Release|Win32 | ||
| {FCF90EF8-93AE-482A-9B55-018B8338B99D}.Release|x86.Build.0 = Release|Win32 | ||
| {768B67D6-E6D3-4A8F-AA61-511FDBCE7937}.Debug|x64.ActiveCfg = Debug|x64 | ||
| {768B67D6-E6D3-4A8F-AA61-511FDBCE7937}.Debug|x64.Build.0 = Debug|x64 | ||
| {768B67D6-E6D3-4A8F-AA61-511FDBCE7937}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| {768B67D6-E6D3-4A8F-AA61-511FDBCE7937}.Debug|x86.Build.0 = Debug|Win32 | ||
| {768B67D6-E6D3-4A8F-AA61-511FDBCE7937}.Release|x64.ActiveCfg = Release|x64 | ||
| {768B67D6-E6D3-4A8F-AA61-511FDBCE7937}.Release|x64.Build.0 = Release|x64 | ||
| {768B67D6-E6D3-4A8F-AA61-511FDBCE7937}.Release|x86.ActiveCfg = Release|Win32 | ||
| {768B67D6-E6D3-4A8F-AA61-511FDBCE7937}.Release|x86.Build.0 = Release|Win32 | ||
| {79433425-EC16-410F-9B91-8D31D2109C90}.Debug|x64.ActiveCfg = Debug|x64 | ||
| {79433425-EC16-410F-9B91-8D31D2109C90}.Debug|x64.Build.0 = Debug|x64 | ||
| {79433425-EC16-410F-9B91-8D31D2109C90}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| {79433425-EC16-410F-9B91-8D31D2109C90}.Debug|x86.Build.0 = Debug|Win32 | ||
| {79433425-EC16-410F-9B91-8D31D2109C90}.Release|x64.ActiveCfg = Release|x64 | ||
| {79433425-EC16-410F-9B91-8D31D2109C90}.Release|x64.Build.0 = Release|x64 | ||
| {79433425-EC16-410F-9B91-8D31D2109C90}.Release|x86.ActiveCfg = Release|Win32 | ||
| {79433425-EC16-410F-9B91-8D31D2109C90}.Release|x86.Build.0 = Release|Win32 | ||
| {6D2EF92A-D693-47E3-A325-A686E78C5FFD}.Debug|x64.ActiveCfg = Debug|x64 | ||
| {6D2EF92A-D693-47E3-A325-A686E78C5FFD}.Debug|x64.Build.0 = Debug|x64 | ||
| {6D2EF92A-D693-47E3-A325-A686E78C5FFD}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| {6D2EF92A-D693-47E3-A325-A686E78C5FFD}.Debug|x86.Build.0 = Debug|Win32 | ||
| {6D2EF92A-D693-47E3-A325-A686E78C5FFD}.Release|x64.ActiveCfg = Release|x64 | ||
| {6D2EF92A-D693-47E3-A325-A686E78C5FFD}.Release|x64.Build.0 = Release|x64 | ||
| {6D2EF92A-D693-47E3-A325-A686E78C5FFD}.Release|x86.ActiveCfg = Release|Win32 | ||
| {6D2EF92A-D693-47E3-A325-A686E78C5FFD}.Release|x86.Build.0 = Release|Win32 | ||
| {BF5C7532-EE0A-479B-9993-72134087D530}.Debug|x64.ActiveCfg = Debug|x64 | ||
| {BF5C7532-EE0A-479B-9993-72134087D530}.Debug|x64.Build.0 = Debug|x64 | ||
| {BF5C7532-EE0A-479B-9993-72134087D530}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| {BF5C7532-EE0A-479B-9993-72134087D530}.Debug|x86.Build.0 = Debug|Win32 | ||
| {BF5C7532-EE0A-479B-9993-72134087D530}.Release|x64.ActiveCfg = Release|x64 | ||
| {BF5C7532-EE0A-479B-9993-72134087D530}.Release|x64.Build.0 = Release|x64 | ||
| {BF5C7532-EE0A-479B-9993-72134087D530}.Release|x86.ActiveCfg = Release|Win32 | ||
| {BF5C7532-EE0A-479B-9993-72134087D530}.Release|x86.Build.0 = Release|Win32 | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(NestedProjects) = preSolution | ||
| {FCF90EF8-93AE-482A-9B55-018B8338B99D} = {14BDCE3D-C9CE-4739-9A78-C3BE5FD99887} | ||
| {FA2B8E71-DD6B-4A8D-8052-69AB758A1144} = {657AF492-1E1A-430A-96AF-93039CF6F2E5} | ||
| {14BDCE3D-C9CE-4739-9A78-C3BE5FD99887} = {657AF492-1E1A-430A-96AF-93039CF6F2E5} | ||
| EndGlobalSection | ||
| GlobalSection(ExtensibilityGlobals) = postSolution | ||
| SolutionGuid = {E601D15F-D808-415A-BE0E-C62970CA4DBE} | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| @REM This file will run command line tests, comparable to test\makefile.am | ||
|
|
||
| @echo off | ||
| SET "BINDIR=%~1" | ||
| SET "SAMPLEDIR=%~2" | ||
| SET "NETLIBDIR=%~3" | ||
| SET "MIPLIBDIR=%~4" | ||
|
|
||
| echo INFO: Running %0 %* | ||
| echo INFO: Using bindir '%BINDIR%' and sampledir '%SAMPLEDIR%'. | ||
| echo INFO: Netlibdir '%NETLIBDIR%' and miplibdir '%MIPLIBDIR%' are ignored for these tests. | ||
|
|
||
| if "%BINDIR%"=="" echo ERROR: No bindir given. && goto :usage | ||
| if not exist "%BINDIR%" echo ERROR: Folder bindir %BINDIR% does not exist. && goto :usage | ||
|
|
||
| if "%SAMPLEDIR%"=="" echo ERROR: No sampledir given. && goto :usage | ||
| if not exist %SAMPLEDIR% echo ERROR: Folder sampledir %SAMPLEDIR% does not exist. && goto :usage | ||
| if not %errorlevel%==0 echo ERROR: %SAMPLEDIR% cannot contain spaces. && goto :usage | ||
|
|
||
| @REM if "%NETLIBDIR%"=="" echo ERROR: No netlibdir given. && goto :usage | ||
| @REM if not exist %NETLIBDIR% echo ERROR: Folder netlibdir %NETLIBDIR% does not exist. && goto :usage | ||
| @REM if not %errorlevel%==0 echo ERROR: %NETLIBDIR% cannot contain spaces. && goto :usage | ||
|
|
||
| @REM if "%MIPLIBDIR%"=="" echo ERROR: No miplibdir given. && goto :usage | ||
| @REM if not exist %MIPLIBDIR% echo ERROR: Folder miplibdir %MIPLIBDIR% does not exist. && goto :usage | ||
| @REM if not %errorlevel%==0 echo ERROR: %MIPLIBDIR% cannot contain spaces. && goto :usage | ||
|
|
||
| goto :test | ||
|
|
||
| :usage | ||
| echo INFO: Usage %0 ^<bindir^> ^<sampledir^> | ||
| echo INFO: where ^<bindir^> contains the executables, sampledir the sample files. | ||
| echo INFO: This script runs automated test. | ||
| echo INFO: The sampledir must not contain spaces! | ||
| echo INFO: For example: %0 "D:\Some Directory\" ..\..\samples\ | ||
| goto :error | ||
|
|
||
| :error | ||
| echo ERROR: An error occurred while running the tests! | ||
| echo INFO: Finished Tests but failed | ||
| exit /b 1 | ||
|
|
||
| :test | ||
| echo INFO: Initializing Tests | ||
| SET "CGLTESTDATADIR=%~dp0..\..\test\CglTestData" | ||
| if not exist "%CGLTESTDATADIR%" echo ERROR: Folder CglTestData %CGLTESTDATADIR% does not exist. && goto :error | ||
|
|
||
| echo INFO: Starting Tests | ||
| @echo on | ||
|
|
||
| "%BINDIR%\CglUnitTest.exe" %SAMPLEDIR% "%CGLTESTDATADIR%" | ||
| @if not %errorlevel%==0 goto :error | ||
|
|
||
| @echo off | ||
| echo INFO: Finished Tests successfully (%ERRORLEVEL%) |
Oops, something went wrong.