mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-29 23:07:48 +02:00
Try to enable AUTO_RCC on msvc
This commit is contained in:
13
.github/workflows/github.yml
vendored
13
.github/workflows/github.yml
vendored
@@ -66,7 +66,7 @@ jobs:
|
|||||||
pack: 1
|
pack: 1
|
||||||
pack_type: RelWithDebInfo
|
pack_type: RelWithDebInfo
|
||||||
extension: exe
|
extension: exe
|
||||||
preset: windows-msvc-release-ccache
|
preset: windows-msvc-release
|
||||||
- platform: mingw
|
- platform: mingw
|
||||||
os: ubuntu-22.04
|
os: ubuntu-22.04
|
||||||
test: 0
|
test: 0
|
||||||
@@ -207,8 +207,15 @@ jobs:
|
|||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
if [[ ${{matrix.preset}} == linux-gcc-test ]]; then GCC14=1; fi
|
if [[ ${{matrix.preset}} == linux-gcc-test ]]
|
||||||
cmake -DENABLE_CCACHE:BOOL=ON --preset ${{ matrix.preset }} ${GCC14:+-DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14}
|
then
|
||||||
|
cmake -DENABLE_CCACHE:BOOL=ON -DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14 --preset ${{ matrix.preset }}
|
||||||
|
elif [[ ${{matrix.platform}} != msvc ]]
|
||||||
|
then
|
||||||
|
cmake -DENABLE_CCACHE:BOOL=ON --preset ${{ matrix.preset }}
|
||||||
|
else
|
||||||
|
cmake --preset ${{ matrix.preset }}
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -112,12 +112,9 @@ endif()
|
|||||||
|
|
||||||
assign_source_group(${launcher_SRCS} ${launcher_HEADERS} ${launcher_RESOURCES} ${launcher_TS} ${launcher_ICON})
|
assign_source_group(${launcher_SRCS} ${launcher_HEADERS} ${launcher_RESOURCES} ${launcher_TS} ${launcher_ICON})
|
||||||
|
|
||||||
# TODO: enabling AUTORCC breaks msvc build on CI
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTOUIC ON)
|
set(CMAKE_AUTOUIC ON)
|
||||||
if(NOT (MSVC AND "$ENV{GITHUB_ACTIONS}" STREQUAL true))
|
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
endif()
|
|
||||||
|
|
||||||
if(POLICY CMP0071)
|
if(POLICY CMP0071)
|
||||||
cmake_policy(SET CMP0071 NEW)
|
cmake_policy(SET CMP0071 NEW)
|
||||||
|
|||||||
Reference in New Issue
Block a user