diff options
| author | 2022-07-05 20:30:38 -0400 | |
|---|---|---|
| committer | 2022-07-05 20:30:38 -0400 | |
| commit | 770611fdf39f274ee9ccde9875e86cfeb79a3f6f (patch) | |
| tree | a580077f3b8f5ebbba6ee58ba594192f68ebdeea /CMakeModules | |
| parent | Merge pull request #8532 from liamwhite/fiber-supplements (diff) | |
| parent | CI: unbreak ADO after GHA changes (diff) | |
| download | yuzu-770611fdf39f274ee9ccde9875e86cfeb79a3f6f.tar.gz yuzu-770611fdf39f274ee9ccde9875e86cfeb79a3f6f.tar.xz yuzu-770611fdf39f274ee9ccde9875e86cfeb79a3f6f.zip | |
Merge pull request #8486 from liushuyu/github-actions-verify
CI: Use GitHub Actions to validate pull requests
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/CopyYuzuFFmpegDeps.cmake | 1 | ||||
| -rw-r--r-- | CMakeModules/MSVCCache.cmake | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/CMakeModules/CopyYuzuFFmpegDeps.cmake b/CMakeModules/CopyYuzuFFmpegDeps.cmake index 26384e8b8..f5ab2806c 100644 --- a/CMakeModules/CopyYuzuFFmpegDeps.cmake +++ b/CMakeModules/CopyYuzuFFmpegDeps.cmake | |||
| @@ -2,5 +2,6 @@ function(copy_yuzu_FFmpeg_deps target_dir) | |||
| 2 | include(WindowsCopyFiles) | 2 | include(WindowsCopyFiles) |
| 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") | 3 | set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/") |
| 4 | file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS) | 4 | file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS) |
| 5 | string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS) | ||
| 5 | windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) | 6 | windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) |
| 6 | endfunction(copy_yuzu_FFmpeg_deps) | 7 | endfunction(copy_yuzu_FFmpeg_deps) |
diff --git a/CMakeModules/MSVCCache.cmake b/CMakeModules/MSVCCache.cmake new file mode 100644 index 000000000..8848e35ea --- /dev/null +++ b/CMakeModules/MSVCCache.cmake | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | # buildcache wrapper | ||
| 2 | OPTION(USE_CCACHE "Use buildcache for compilation" OFF) | ||
| 3 | IF(USE_CCACHE) | ||
| 4 | FIND_PROGRAM(CCACHE buildcache) | ||
| 5 | IF (CCACHE) | ||
| 6 | MESSAGE(STATUS "Using buildcache found in PATH") | ||
| 7 | SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE}) | ||
| 8 | SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE}) | ||
| 9 | ELSE(CCACHE) | ||
| 10 | MESSAGE(WARNING "USE_CCACHE enabled, but no buildcache executable found") | ||
| 11 | ENDIF(CCACHE) | ||
| 12 | ENDIF(USE_CCACHE) | ||