diff options
| author | 2019-12-06 13:19:04 -0500 | |
|---|---|---|
| committer | 2019-12-06 13:19:04 -0500 | |
| commit | ef2b6733d0dbf060de8078107c1d6b073e483cfb (patch) | |
| tree | b9bf031380326554c416dcc3f4c07df1f5064e8a | |
| parent | Merge pull request #3191 from yuzu-emu/jroweboy-patch-1 (diff) | |
| parent | Ignore git-related files in cmake for EA tarballs (diff) | |
| download | yuzu-ef2b6733d0dbf060de8078107c1d6b073e483cfb.tar.gz yuzu-ef2b6733d0dbf060de8078107c1d6b073e483cfb.tar.xz yuzu-ef2b6733d0dbf060de8078107c1d6b073e483cfb.zip | |
Merge pull request #3196 from jmerdich/fix-ea-source-build
[EA source]: Ignore git-related files in cmake for early access tarballs
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b3b0d6d5..118572c03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -29,7 +29,7 @@ option(ENABLE_VULKAN "Enables Vulkan backend" ON) | |||
| 29 | 29 | ||
| 30 | option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) | 30 | option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) |
| 31 | 31 | ||
| 32 | if(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit) | 32 | if(EXISTS ${PROJECT_SOURCE_DIR}/hooks/pre-commit AND NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit) |
| 33 | message(STATUS "Copying pre-commit hook") | 33 | message(STATUS "Copying pre-commit hook") |
| 34 | file(COPY hooks/pre-commit | 34 | file(COPY hooks/pre-commit |
| 35 | DESTINATION ${PROJECT_SOURCE_DIR}/.git/hooks) | 35 | DESTINATION ${PROJECT_SOURCE_DIR}/.git/hooks) |
| @@ -49,7 +49,10 @@ function(check_submodules_present) | |||
| 49 | endif() | 49 | endif() |
| 50 | endforeach() | 50 | endforeach() |
| 51 | endfunction() | 51 | endfunction() |
| 52 | check_submodules_present() | 52 | |
| 53 | if(EXISTS ${PROJECT_SOURCE_DIR}/.gitmodules) | ||
| 54 | check_submodules_present() | ||
| 55 | endif() | ||
| 53 | 56 | ||
| 54 | configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc | 57 | configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc |
| 55 | ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc | 58 | ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc |