Skip to content

[pull] master from flameshot-org:master #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Sep 19, 2025
Merged

[pull] master from flameshot-org:master #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,17 @@
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_bg.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ca.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_cs.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_da.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_de_DE.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_el.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_en.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_es.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_et.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_eu.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_fa.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_fi.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_fr.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ga.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_gl.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_grc.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_he.ts
Expand All @@ -138,12 +141,17 @@
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_nb_NO.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_nl_NL.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_nl.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_pt.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_pl.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_pt_BR.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ro.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ru.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_sk.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_sr_SP.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_sv_SE.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_sw.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_ta.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_th.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_tr.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_uk.ts
${CMAKE_SOURCE_DIR}/data/translations/Internationalization_vi.ts
Expand Down Expand Up @@ -286,7 +294,7 @@
endif ()

if (NOT USE_OPENSSL)
message(WARNING "OpenSSL is required to upload screenshots")

Check warning on line 297 in src/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / VS 2022 x64-installer 

OpenSSL is required to upload screenshots

Check warning on line 297 in src/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / VS 2022 x64-portable 

OpenSSL is required to upload screenshots

Check warning on line 297 in src/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / VS 2022 x64-portable 

OpenSSL is required to upload screenshots

Check warning on line 297 in src/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / VS 2022 x64-installer 

OpenSSL is required to upload screenshots
endif ()
endif ()

Expand Down Expand Up @@ -461,7 +469,7 @@
FILES_MATCHING
PATTERN "*.dll")
else ()
message(WARNING "Unable to find OpenSSL dlls.")

Check warning on line 472 in src/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / VS 2022 x64-installer 

Unable to find OpenSSL dlls.

Check warning on line 472 in src/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / VS 2022 x64-portable 

Unable to find OpenSSL dlls.

Check warning on line 472 in src/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / VS 2022 x64-portable 

Unable to find OpenSSL dlls.

Check warning on line 472 in src/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / VS 2022 x64-installer 

Unable to find OpenSSL dlls.
endif ()
endif ()

Expand Down
Loading