From 7e6a6a3e2d899c5424b4a0fb1a050d9a4b96eac5 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 23 Sep 2024 15:49:33 +0200 Subject: [PATCH] Fix build against release For the release download, we need a `v` prefix for the `download/v1.8.0` path, but just `1.8.0` as filename infix. --- stm32h735g-dk/cmake/FindSlint.cmake | 6 ++++-- stm32h747i-disco/cmake/FindSlint.cmake | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/stm32h735g-dk/cmake/FindSlint.cmake b/stm32h735g-dk/cmake/FindSlint.cmake index 584c289..d60f86c 100644 --- a/stm32h735g-dk/cmake/FindSlint.cmake +++ b/stm32h735g-dk/cmake/FindSlint.cmake @@ -56,11 +56,13 @@ if (NOT DEFINED Slint_FIND_VERSION) # Set this to instruct the slint-compiler download to use the same release set(SLINT_GITHUB_RELEASE "nightly" CACHE STRING "") set(github_release "nightly") + set(github_filename_infix "nightly") else() - set(github_release "${Slint_FIND_VERSION}") + set(github_release "v${Slint_FIND_VERSION}") + set(github_filename_infix "${Slint_FIND_VERSION}") endif() -set(prebuilt_archive_filename "Slint-cpp-${github_release}-${SLINT_TARGET_ARCHITECTURE}.tar.gz") +set(prebuilt_archive_filename "Slint-cpp-${github_filename_infix}-${SLINT_TARGET_ARCHITECTURE}.tar.gz") set(download_target_path "${CMAKE_BINARY_DIR}/slint-prebuilt/") set(download_url "https://github.com/slint-ui/slint/releases/download/${github_release}/${prebuilt_archive_filename}") diff --git a/stm32h747i-disco/cmake/FindSlint.cmake b/stm32h747i-disco/cmake/FindSlint.cmake index 584c289..d60f86c 100644 --- a/stm32h747i-disco/cmake/FindSlint.cmake +++ b/stm32h747i-disco/cmake/FindSlint.cmake @@ -56,11 +56,13 @@ if (NOT DEFINED Slint_FIND_VERSION) # Set this to instruct the slint-compiler download to use the same release set(SLINT_GITHUB_RELEASE "nightly" CACHE STRING "") set(github_release "nightly") + set(github_filename_infix "nightly") else() - set(github_release "${Slint_FIND_VERSION}") + set(github_release "v${Slint_FIND_VERSION}") + set(github_filename_infix "${Slint_FIND_VERSION}") endif() -set(prebuilt_archive_filename "Slint-cpp-${github_release}-${SLINT_TARGET_ARCHITECTURE}.tar.gz") +set(prebuilt_archive_filename "Slint-cpp-${github_filename_infix}-${SLINT_TARGET_ARCHITECTURE}.tar.gz") set(download_target_path "${CMAKE_BINARY_DIR}/slint-prebuilt/") set(download_url "https://github.com/slint-ui/slint/releases/download/${github_release}/${prebuilt_archive_filename}")