diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-09-12 15:51:23 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-09-12 15:51:23 -0500 |
| commit | 3a1601f132df2ae76194f04153b6bb0f6f3a9d10 (patch) | |
| tree | a2e1b939c4ae42f7b9230d5e3c6b8b35d3b50c4b | |
| parent | fd956b54b591f2f91a17efb85fbc6318f6c657d6 (diff) | |
| parent | 9d054627152314c748b59611714b8641b3951db2 (diff) | |
| download | monzero-gui-3a1601f132df2ae76194f04153b6bb0f6f3a9d10.tar.gz monzero-gui-3a1601f132df2ae76194f04153b6bb0f6f3a9d10.tar.xz monzero-gui-3a1601f132df2ae76194f04153b6bb0f6f3a9d10.zip | |
Merge pull request #3050
9d05462 cmake: fix DEV_MODE, checkout master in submodule (selsta)
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b783fb05..e8129547 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,12 @@ if(GIT_FOUND) message(STATUS "Checking submodules") check_submodule(monero) else() - execute_process(COMMAND cd monero && git checkout origin/master) + 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 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") + message(FATAL_ERROR "Updating git submodule to master (-DDEV_MODE=ON) failed") + endif() endif() endif() |