Merge branch 'ci-msw-clang' of https://github.com/MaartenBent/wxWidgets
Add GitHub action building with clang on MSW. See #22979.
This commit is contained in:
commit
5e60a09aa8
3 changed files with 38 additions and 1 deletions
34
.github/workflows/ci_msw.yml
vendored
34
.github/workflows/ci_msw.yml
vendored
|
|
@ -121,3 +121,37 @@ jobs:
|
|||
working-directory: tests
|
||||
run: |
|
||||
.\vc*msw*\test_gui.exe
|
||||
|
||||
msw-msys2-clang:
|
||||
runs-on: windows-latest
|
||||
|
||||
defaults:
|
||||
run:
|
||||
shell: msys2 {0}
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
|
||||
- name: Setup MSYS2
|
||||
uses: msys2/setup-msys2@v2
|
||||
with:
|
||||
msystem: mingw64
|
||||
update: true
|
||||
install: mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang
|
||||
|
||||
- name: Configuring
|
||||
run: |
|
||||
clang --version
|
||||
cmake --version
|
||||
mkdir build_cmake
|
||||
pushd build_cmake
|
||||
cmake -G "MinGW Makefiles" -DCMAKE_C_COMPILER=clang.exe -DCMAKE_CXX_COMPILER=clang++.exe -DwxBUILD_SAMPLES=ALL -DwxBUILD_TESTS=ALL -DwxBUILD_DEMOS=ON -DCMAKE_BUILD_TYPE=Release ..
|
||||
|
||||
- name: Building
|
||||
working-directory: build_cmake
|
||||
run: |
|
||||
wxPROC_COUNT=`../build/tools/proc_count.sh`
|
||||
cmake --build . -- -j$wxPROC_COUNT
|
||||
|
|
|
|||
|
|
@ -33,6 +33,9 @@ if(wxUSE_ZLIB STREQUAL "builtin")
|
|||
# more convenient than having to modify it to avoid them.
|
||||
target_compile_definitions(wxzlib PRIVATE _CRT_NONSTDC_NO_WARNINGS)
|
||||
endif()
|
||||
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
target_compile_options(wxzlib PRIVATE -Wno-deprecated-non-prototype)
|
||||
endif()
|
||||
set(ZLIB_LIBRARIES wxzlib)
|
||||
set(ZLIB_INCLUDE_DIRS ${wxSOURCE_DIR}/src/zlib)
|
||||
elseif(wxUSE_ZLIB)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# This script outputs the number of available processors/cores plus one.
|
||||
|
||||
case `uname` in
|
||||
Linux)
|
||||
Linux|MSYS*|MINGW*)
|
||||
wxPROC_COUNT=`nproc`
|
||||
;;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue