Thanks to visit codestin.com
Credit goes to github.com

Skip to content

change pacboy compiler target for windows builds #1915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmah42 merged 13 commits into from
Feb 5, 2025
+22 −39
Merged

change pacboy compiler target for windows builds #1915

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8a3c0ec
change pacboy compiler target for windows builds
dmah42 Jan 30, 2025
33acda9
use an action for cmake instead of doing things manually
dmah42 Jan 30, 2025
8dc6028
set compiler for cmake
dmah42 Jan 30, 2025
1fccfee
remove cmake action from msys2 build
dmah42 Jan 30, 2025
e7bda47
readd cmake package for msys2
dmah42 Jan 30, 2025
308f388
fix cmake test path to match build
dmah42 Jan 30, 2025
221cc3f
fix msvc build type setting
dmah42 Jan 30, 2025
bbdf113
fix msvc build type setting
dmah42 Jan 30, 2025
6ffaa2f
consistent output directory for msvc
dmah42 Jan 30, 2025
4d98655
remove legacy environments (https://www.msys2.org/docs/environments/\…
dmah42 Feb 4, 2025
2f00483
remove shell overrides and depend on default for msys2
dmah42 Feb 4, 2025
ab74c6c
Merge branch 'main' into fixwindows
dmah42 Feb 4, 2025
e7a8e32
Merge branch 'main' into fixwindows
dmah42 Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use an action for cmake instead of doing things manually
  • Loading branch information
@dmah42
dmah42 committed Jan 30, 2025
commit 33acda95bf0048469e43cc1e3ac047d71902e253
82 changes: 30 additions & 52 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,33 +25,18 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: lukka/get-cmake@latest

- name: create build environment
run: cmake -E make_directory ${{ runner.workspace }}/_build

- name: setup cmake initial cache
run: touch compiler-cache.cmake

- name: configure cmake
env:
CXX: ${{ matrix.compiler }}
shell: bash
working-directory: ${{ runner.workspace }}/_build
run: >
cmake -C ${{ github.workspace }}/compiler-cache.cmake
$GITHUB_WORKSPACE
-DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON
-DBUILD_SHARED_LIBS=${{ matrix.lib == 'shared' }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-DCMAKE_CXX_COMPILER=${{ env.CXX }}
-DCMAKE_CXX_VISIBILITY_PRESET=hidden
-DCMAKE_VISIBILITY_INLINES_HIDDEN=ON

- name: build
shell: bash
working-directory: ${{ runner.workspace }}/_build
run: cmake --build . --config ${{ matrix.build_type }}
uses: threeal/[email protected]
with:
build-dir: ${{ runner.workspace }}/_build
cxx-compiler: ${{ matrix.compiler }}
options: |
BENCHMARK_DOWNLOAD_DEPENDENCIES=ON
BUILD_SHARED_LIBS=${{ matrix.lib == 'shared' }}
CMAKE_BUILD_TYPE=${{ matrix.build_type }}
CMAKE_CXX_COMPILER=${{ env.CXX }}
CMAKE_CXX_VISIBILITY_PRESET=hidden
CMAKE_VISIBILITY_INLINES_HIDDEN=ON

- name: test
shell: bash
Expand All @@ -70,8 +55,6 @@ jobs:
msvc:
- VS-16-2019
- VS-17-2022
arch:
- x64
build_type:
- Debug
- Release
Expand All @@ -89,21 +72,18 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: lukka/get-cmake@latest

- name: configure cmake
run: >
cmake -S . -B _build/
-A ${{ matrix.arch }}
-G "${{ matrix.generator }}"
-DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON
-DBUILD_SHARED_LIBS=${{ matrix.lib == 'shared' }}

- name: build
run: cmake --build _build/ --config ${{ matrix.build_type }}
uses: threeal/[email protected]
with:
build-dir: ${{ runner.workspace }}/_build
generator: ${{ matrix.generator }}
options: |
BENCHMARK_DOWNLOAD_DEPENDENCIES=ON
BUILD_SHARED_LIBS=${{ matrix.lib == 'shared' }}

- name: test
run: ctest --test-dir _build/ -C ${{ matrix.build_type }} -VV
working-directory: ${{ runner.workspace }}/_build
run: ctest -C ${{ matrix.build_type }} -VV

msys2:
name: ${{ matrix.os }}.${{ matrix.build_type }}.${{ matrix.lib }}.${{ matrix.msys2.msystem }}
Expand Down Expand Up @@ -143,20 +123,18 @@ jobs:
pacboy: >-
gcc:p
clang:p
cmake:p
ninja:p

- name: configure cmake
env:
CXX: ${{ matrix.msys2.compiler }}
run: >
cmake -S . -B _build/
-GNinja
-DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON
-DBUILD_SHARED_LIBS=${{ matrix.lib == 'shared' }}

- name: build
run: cmake --build _build/ --config ${{ matrix.build_type }}
uses: threeal/[email protected]
with:
build-dir: ${{ runner.workspace }}/_build
generator: Ninja
cxx-compiler: ${{ matrix.msys2.msystem.compiler }}
options: |
BENCHMARK_DOWNLOAD_DEPENDENCIES=ON
BUILD_SHARED_LIBS=${{ matrix.lib == 'shared' }}

- name: test
run: ctest --test-dir _build/ -C ${{ matrix.build_type }} -VV
working-directory: ${{ runner.workspace }}/_build
run: ctest -C ${{ matrix.build_type }} -VV
Loading