diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-03-19 01:08:02 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-03-19 01:08:02 -0400 |
| commit | 3e8bc1dcd37ada696035b67586bc8103f506e28d (patch) | |
| tree | 9a0720341a4f5ada0cfb31fd0dd0156fe4898908 | |
| parent | 8dd06bba5cbb2b6b4c7a36df0fb18b3a805acce9 (diff) | |
| parent | ad19dbb4405a3f2b5495a5fa9ab7bf810e657511 (diff) | |
| download | monzero-gui-3e8bc1dcd37ada696035b67586bc8103f506e28d.tar.gz monzero-gui-3e8bc1dcd37ada696035b67586bc8103f506e28d.tar.xz monzero-gui-3e8bc1dcd37ada696035b67586bc8103f506e28d.zip | |
Merge pull request #3354
ad19dbb cmake: sync submodule if DEV_MODE=ON (selsta)
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 914468a6..267e1d76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,8 +48,9 @@ if(NOT MANUAL_SUBMODULES) else() execute_process(COMMAND ${GIT_EXECUTABLE} fetch WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_FETCH_RESULT) execute_process(COMMAND ${GIT_EXECUTABLE} checkout -f origin/master WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_CHECKOUT_MASTER_RESULT) + execute_process(COMMAND ${GIT_EXECUTABLE} submodule sync --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_SUBMODULE_SYNC_RESULT) execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --force --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/monero RESULT_VARIABLE GIT_SUBMODULE_UPDATE_RESULT) - if(NOT GIT_FETCH_RESULT EQUAL "0" OR NOT GIT_CHECKOUT_MASTER_RESULT EQUAL "0" OR NOT GIT_SUBMODULE_UPDATE_RESULT EQUAL "0") + if(NOT GIT_FETCH_RESULT EQUAL "0" OR NOT GIT_CHECKOUT_MASTER_RESULT EQUAL "0" OR NOT GIT_SUBMODULE_SYNC_RESULT EQUAL "0" OR NOT GIT_SUBMODULE_UPDATE_RESULT EQUAL "0") message(FATAL_ERROR "Updating git submodule to master (-DDEV_MODE=ON) failed") endif() endif() |