diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a09368b..9164d31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,7 @@ if (CONVERT_EXECUTABLE AND NOT WIN32) set (icon_svg ${icon_base}/scalable/apps/logdiag.svg) set (icon_size_list 16x16 32x32 48x48) + # ImageMagick very oddly outperforms rsvg-convert with our specific SVG set (icon_png_list) set (icon_symbolic_list) foreach (icon_size ${icon_size_list}) @@ -59,6 +60,8 @@ if (CONVERT_EXECUTABLE AND NOT WIN32) PROPERTIES SYMBOLIC TRUE) endforeach () + # Symbolic targets prevent the icons from being either cleaned, + # or pointlessly regenerated slightly differently set (icon_ico ${PROJECT_SOURCE_DIR}/share/logdiag.ico) add_custom_target (${PROJECT_NAME}_icons DEPENDS ${icon_symbolic_list} @@ -72,7 +75,8 @@ pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0) link_directories (${GTK3_LIBRARY_DIRS}) if (NOT WIN32) - pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2) + pkg_search_module (Lua REQUIRED lua>=5.2 + lua5.4 lua-5.4 lua5.3 lua-5.3 lua5.2 lua-5.2) link_directories (${Lua_LIBRARY_DIRS}) else () # For whatever reason this now seems to be required @@ -448,7 +452,7 @@ set (CPACK_DEBIAN_PACKAGE_HOMEPAGE "${project_URL}") set (CPACK_RPM_PACKAGE_REQUIRES "gtk3 >= 3.8, json-glib >= 0.10.4, lua = 5.2") set (CPACK_RPM_PACKAGE_GROUP "Graphics") -set (CPACK_RPM_PACKAGE_LICENSE "ISC") +set (CPACK_RPM_PACKAGE_LICENSE "0BSD") set (CPACK_RPM_PACKAGE_URL "${project_URL}") set (CPACK_SOURCE_GENERATOR "TGZ;ZIP") |