From a2a284dbdbbcb4423f42c3f3ef4c9a97a53455cb Mon Sep 17 00:00:00 2001 From: Phoenix Date: Sat, 31 Aug 2024 16:13:55 +1000 Subject: [PATCH] chore: update branch references from master to main in CMake files Updated references from 'master' to 'main' in CMakeLists.txt and DownloadExternals.cmake to align with the updated default branch naming convention. This ensures that the build process uses the correct branch for dependencies and scripts. --- CMakeLists.txt | 4 ++-- CMakeModules/DownloadExternals.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 89be672..08aa835 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ if (UZUY_USE_BUNDLED_VCPKG) set(VCPKG_DOWNLOADS_PATH ${PROJECT_SOURCE_DIR}/externals/vcpkg/downloads) set(NASM_VERSION "2.16.01") set(NASM_DESTINATION_PATH ${VCPKG_DOWNLOADS_PATH}/nasm-${NASM_VERSION}-win64.zip) - set(NASM_DOWNLOAD_URL "https://github.com/uzuy-emu/ext-windows-bin/raw/master/nasm/nasm-${NASM_VERSION}-win64.zip") + set(NASM_DOWNLOAD_URL "https://github.com/uzuy-emu/ext-windows-bin/raw/main/nasm/nasm-${NASM_VERSION}-win64.zip") if (NOT EXISTS ${NASM_DESTINATION_PATH}) file(DOWNLOAD ${NASM_DOWNLOAD_URL} ${NASM_DESTINATION_PATH} SHOW_PROGRESS STATUS NASM_STATUS) @@ -620,7 +620,7 @@ if (NOT CLANG_FORMAT) message(STATUS "Clang format not found! Downloading...") set(CLANG_FORMAT "${PROJECT_BINARY_DIR}/externals/clang-format${CLANG_FORMAT_POSTFIX}.exe") file(DOWNLOAD - https://github.com/uzuy-emu/ext-windows-bin/raw/master/clang-format${CLANG_FORMAT_POSTFIX}.exe + https://github.com/uzuy-emu/ext-windows-bin/raw/main/clang-format${CLANG_FORMAT_POSTFIX}.exe "${CLANG_FORMAT}" SHOW_PROGRESS STATUS DOWNLOAD_SUCCESS) if (NOT DOWNLOAD_SUCCESS EQUAL 0) diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index 2ab522a..aec816c 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -11,7 +11,7 @@ set(package_base_url "https://github.com/uzuy-emu/") set(package_repo "no_platform") set(package_extension "no_platform") if (WIN32) - set(package_repo "ext-windows-bin/raw/master/") + set(package_repo "ext-windows-bin/raw/main/") set(package_extension ".7z") elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(package_repo "ext-linux-bin/raw/main/")