Merge pull request #1108 from manongjohn/enable_windows_ccache
Configure ccache for Windows builds
This commit is contained in:
commit
b1cd74020c
3 changed files with 21 additions and 3 deletions
9
.github/workflows/windows_build.yml
vendored
9
.github/workflows/windows_build.yml
vendored
|
@ -12,6 +12,15 @@ jobs:
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: |
|
run: |
|
||||||
ci-scripts\windows\tahoma-install.bat
|
ci-scripts\windows\tahoma-install.bat
|
||||||
|
choco install ccache
|
||||||
|
copy C:\ProgramData\chocolatey\lib\ccache\tools\ccache*\ccache.exe C:\ProgramData\chocolatey\bin\cl.exe
|
||||||
|
mkdir %LOCALAPPDATA%\ccache
|
||||||
|
- uses: actions/cache@v3
|
||||||
|
with:
|
||||||
|
path: |
|
||||||
|
~/AppData/Local/ccache
|
||||||
|
key: ${{ runner.os }}-${{ github.sha }}
|
||||||
|
restore-keys: ${{ runner.os }}-
|
||||||
- name: Get CanonSDK
|
- name: Get CanonSDK
|
||||||
if: ${{ github.repository_owner == 'tahoma2d' && github.event_name == 'push' }}
|
if: ${{ github.repository_owner == 'tahoma2d' && github.event_name == 'push' }}
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -30,6 +30,11 @@ IF EXIST ..\..\thirdparty\crashrpt\include set WITH_CRASHRPT=Y
|
||||||
|
|
||||||
cmake ..\sources -G %MSVCVERSION% -Ax64 -DQT_PATH=%QT_PATH% -DBOOST_ROOT=%BOOST_ROOT% -DOpenCV_DIR=%OPENCV_DIR% -DWITH_CANON=%WITH_CANON% -DWITH_CRASHRPT=%WITH_CRASHRPT%
|
cmake ..\sources -G %MSVCVERSION% -Ax64 -DQT_PATH=%QT_PATH% -DBOOST_ROOT=%BOOST_ROOT% -DOpenCV_DIR=%OPENCV_DIR% -DWITH_CANON=%WITH_CANON% -DWITH_CRASHRPT=%WITH_CRASHRPT%
|
||||||
|
|
||||||
msbuild /property:Configuration=RelWithDebInfo /m /verbosity:minimal ALL_BUILD.vcxproj
|
|
||||||
|
IF EXIST C:\ProgramData\chocolatey\bin\cl.exe (
|
||||||
|
msbuild /p:CLToolPath=C:\ProgramData\chocolatey\bin /p:UseMultiToolTask=true /p:Configuration=RelWithDebInfo /m /verbosity:minimal ALL_BUILD.vcxproj
|
||||||
|
) ELSE (
|
||||||
|
msbuild /p:Configuration=RelWithDebInfo /m /verbosity:minimal ALL_BUILD.vcxproj
|
||||||
|
)
|
||||||
|
|
||||||
cd ../..
|
cd ../..
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
cmake_minimum_required(VERSION 2.8.11)
|
cmake_policy(SET CMP0141 NEW)
|
||||||
|
set(CMAKE_POLICY_DEFAULT_CMP0141 NEW)
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 2.8.11)
|
||||||
|
|
||||||
set(CMAKE_BUILD_TYPE_INIT Release)
|
set(CMAKE_BUILD_TYPE_INIT Release)
|
||||||
|
|
||||||
|
@ -143,6 +146,7 @@ if(BUILD_ENV_MSVC)
|
||||||
-DNOMINMAX
|
-DNOMINMAX
|
||||||
-D_USE_MATH_DEFINES
|
-D_USE_MATH_DEFINES
|
||||||
)
|
)
|
||||||
|
set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
|
||||||
elseif(BUILD_ENV_APPLE)
|
elseif(BUILD_ENV_APPLE)
|
||||||
if(NOT PLATFORM)
|
if(NOT PLATFORM)
|
||||||
set(PLATFORM 64)
|
set(PLATFORM 64)
|
||||||
|
|
Loading…
Reference in a new issue