summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jake Merdich2019-12-05 22:48:20 -0500
committerGravatar Jake Merdich2019-12-05 22:48:20 -0500
commitdc70a36b44ccea32a4a22c2b562f0c5d9d48bc90 (patch)
treeb9bf031380326554c416dcc3f4c07df1f5064e8a
parentMerge pull request #3191 from yuzu-emu/jroweboy-patch-1 (diff)
downloadyuzu-dc70a36b44ccea32a4a22c2b562f0c5d9d48bc90.tar.gz
yuzu-dc70a36b44ccea32a4a22c2b562f0c5d9d48bc90.tar.xz
yuzu-dc70a36b44ccea32a4a22c2b562f0c5d9d48bc90.zip
Ignore git-related files in cmake for EA tarballs
This fixes the early-access builds on Windows (tested on EA 58). Cmake was previously looking for git-related files that were stripped out of the early access builds and failing; check if those exist before reading them.
-rw-r--r--CMakeLists.txt7
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
30option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) 30option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
31 31
32if(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit) 32if(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()
51endfunction() 51endfunction()
52check_submodules_present() 52
53if(EXISTS ${PROJECT_SOURCE_DIR}/.gitmodules)
54 check_submodules_present()
55endif()
53 56
54configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc 57configure_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