Skip to content

Commit

Permalink
Fix build against release
Browse files Browse the repository at this point in the history
For the release download, we need a `v` prefix for the `download/v1.8.0`
path, but just `1.8.0` as filename infix.
  • Loading branch information
tronical committed Sep 23, 2024
1 parent 9d6c1cd commit 7e6a6a3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions stm32h735g-dk/cmake/FindSlint.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

Expand Down
6 changes: 4 additions & 2 deletions stm32h747i-disco/cmake/FindSlint.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

Expand Down

0 comments on commit 7e6a6a3

Please sign in to comment.