mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-16 06:59:55 +00:00
Merge branch 'sea-cache' into 'master'
MSVC CCache support See merge request OpenMW/openmw!3938
This commit is contained in:
commit
dce0a9e11e
3 changed files with 23 additions and 9 deletions
|
@ -576,7 +576,7 @@ macOS14_Xcode15_arm64:
|
|||
- cd MSVC2019_64_Ninja
|
||||
- .\ActivateMSVC.ps1
|
||||
- cmake --build . --config $config
|
||||
- ccache --show-stats
|
||||
- ccache --show-stats -v
|
||||
- cd $config
|
||||
- echo "CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME}`nCI_JOB_ID ${CI_JOB_ID}`nCI_COMMIT_SHA ${CI_COMMIT_SHA}" | Out-File -Encoding UTF8 CI-ID.txt
|
||||
- $artifactDirectory = "$(Make-SafeFileName("${CI_PROJECT_NAMESPACE}"))/$(Make-SafeFileName("${CI_COMMIT_REF_NAME}"))/$(Make-SafeFileName("${CI_COMMIT_SHORT_SHA}-${CI_JOB_ID}"))/"
|
||||
|
@ -666,7 +666,6 @@ macOS14_Xcode15_arm64:
|
|||
- choco source disable -n=chocolatey
|
||||
- choco install git --force --params "/GitAndUnixToolsOnPath" -y
|
||||
- choco install 7zip -y
|
||||
- choco install ccache -y
|
||||
- choco install vswhere -y
|
||||
- choco install python -y
|
||||
- choco install awscli -y
|
||||
|
@ -689,15 +688,11 @@ macOS14_Xcode15_arm64:
|
|||
- $time = (Get-Date -Format "HH:mm:ss")
|
||||
- echo ${time}
|
||||
- echo "started by ${GITLAB_USER_NAME}"
|
||||
- $env:CCACHE_BASEDIR = Get-Location
|
||||
- $env:CCACHE_DIR = "$(Get-Location)\ccache"
|
||||
- New-Item -Type Directory -Force -Path $env:CCACHE_DIR
|
||||
- New-Item -Type File -Force -Path MSVC2019_64\.cmake\api\v1\query\codemodel-v2
|
||||
- sh CI/before_script.msvc.sh -c $config -p Win64 -v 2019 -k -V -b -t -C $multiview -E
|
||||
- cd MSVC2019_64
|
||||
- Get-Volume
|
||||
- cmake --build . --config $config
|
||||
- ccache --show-stats
|
||||
- cd $config
|
||||
- echo "CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME}`nCI_JOB_ID ${CI_JOB_ID}`nCI_COMMIT_SHA ${CI_COMMIT_SHA}" | Out-File -Encoding UTF8 CI-ID.txt
|
||||
- $artifactDirectory = "$(Make-SafeFileName("${CI_PROJECT_NAMESPACE}"))/$(Make-SafeFileName("${CI_COMMIT_REF_NAME}"))/$(Make-SafeFileName("${CI_COMMIT_SHORT_SHA}-${CI_JOB_ID}"))/"
|
||||
|
@ -729,7 +724,6 @@ macOS14_Xcode15_arm64:
|
|||
cache:
|
||||
key: msbuild-v8
|
||||
paths:
|
||||
- ccache
|
||||
- deps
|
||||
- MSVC2019_64/deps/Qt
|
||||
artifacts:
|
||||
|
|
|
@ -528,8 +528,12 @@ if ! [ -z $UNITY_BUILD ]; then
|
|||
add_cmake_opts "-DOPENMW_UNITY_BUILD=True"
|
||||
fi
|
||||
|
||||
if ! [ -z $USE_CCACHE ]; then
|
||||
add_cmake_opts "-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
|
||||
if [ -n "$USE_CCACHE" ]; then
|
||||
if [ -n "$NMAKE" ] || [ -n "$NINJA" ]; then
|
||||
add_cmake_opts "-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DPRECOMPILE_HEADERS_WITH_MSVC=OFF"
|
||||
else
|
||||
echo "Ignoring -C (CCache) as it is incompatible with Visual Studio CMake generators"
|
||||
fi
|
||||
fi
|
||||
|
||||
# turn on LTO by default
|
||||
|
|
|
@ -191,6 +191,22 @@ if (MSVC)
|
|||
add_compile_options(/bigobj)
|
||||
|
||||
add_compile_options(/Zc:__cplusplus)
|
||||
|
||||
if (CMAKE_CXX_COMPILER_LAUNCHER OR CMAKE_C_COMPILER_LAUNCHER)
|
||||
if (CMAKE_GENERATOR MATCHES "Visual Studio")
|
||||
message(STATUS "A compiler launcher was specified, but will be unused by the current generator (${CMAKE_GENERATOR})")
|
||||
else()
|
||||
foreach (config_lower ${CMAKE_CONFIGURATION_TYPES})
|
||||
string(TOUPPER "${config_lower}" config)
|
||||
if (CMAKE_C_COMPILER_LAUNCHER STREQUAL "ccache")
|
||||
string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_${config} "${CMAKE_C_FLAGS_${config}}")
|
||||
endif()
|
||||
if (CMAKE_CXX_COMPILER_LAUNCHER STREQUAL "ccache")
|
||||
string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_${config} "${CMAKE_CXX_FLAGS_${config}}")
|
||||
endif()
|
||||
endforeach()
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Set up common paths
|
||||
|
|
Loading…
Reference in a new issue