diff options
| author | 2022-08-21 13:38:26 -0400 | |
|---|---|---|
| committer | 2022-08-21 13:38:26 -0400 | |
| commit | 3701255e4fd7fe1ead3524dc6f6650a724b1b9eb (patch) | |
| tree | 37260a0b25e0efc494c63053d3a175e47c76ed87 | |
| parent | Merge pull request #8784 from Docteh/nosnek (diff) | |
| parent | cmake: add option to check submodules (diff) | |
| download | yuzu-3701255e4fd7fe1ead3524dc6f6650a724b1b9eb.tar.gz yuzu-3701255e4fd7fe1ead3524dc6f6650a724b1b9eb.tar.xz yuzu-3701255e4fd7fe1ead3524dc6f6650a724b1b9eb.zip | |
Merge pull request #8676 from abouvier/no-check-sub
cmake: add option to check submodules
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f508d61a..0ee012aca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -40,6 +40,8 @@ option(YUZU_TESTS "Compile tests" ON) | |||
| 40 | 40 | ||
| 41 | option(YUZU_USE_BUNDLED_VCPKG "Use vcpkg for yuzu dependencies" "${MSVC}") | 41 | option(YUZU_USE_BUNDLED_VCPKG "Use vcpkg for yuzu dependencies" "${MSVC}") |
| 42 | 42 | ||
| 43 | option(YUZU_CHECK_SUBMODULES "Check if submodules are present" ON) | ||
| 44 | |||
| 43 | if (YUZU_USE_BUNDLED_VCPKG) | 45 | if (YUZU_USE_BUNDLED_VCPKG) |
| 44 | if (YUZU_TESTS) | 46 | if (YUZU_TESTS) |
| 45 | list(APPEND VCPKG_MANIFEST_FEATURES "yuzu-tests") | 47 | list(APPEND VCPKG_MANIFEST_FEATURES "yuzu-tests") |
| @@ -81,7 +83,7 @@ function(check_submodules_present) | |||
| 81 | endforeach() | 83 | endforeach() |
| 82 | endfunction() | 84 | endfunction() |
| 83 | 85 | ||
| 84 | if(EXISTS ${PROJECT_SOURCE_DIR}/.gitmodules) | 86 | if(EXISTS ${PROJECT_SOURCE_DIR}/.gitmodules AND YUZU_CHECK_SUBMODULES) |
| 85 | check_submodules_present() | 87 | check_submodules_present() |
| 86 | endif() | 88 | endif() |
| 87 | configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc | 89 | configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc |