removed creation of Windows icon
This commit is contained in:
parent
7da9d321ce
commit
b8ffcc74c9
|
@ -56,7 +56,7 @@ set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}")
|
||||||
set(META_APP_DESCRIPTION "Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities.")
|
set(META_APP_DESCRIPTION "Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities.")
|
||||||
set(META_VERSION_MAJOR 3)
|
set(META_VERSION_MAJOR 3)
|
||||||
set(META_VERSION_MINOR 1)
|
set(META_VERSION_MINOR 1)
|
||||||
set(META_VERSION_PATCH 0)
|
set(META_VERSION_PATCH 1)
|
||||||
set(META_APP_VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH})
|
set(META_APP_VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH})
|
||||||
|
|
||||||
# stringification of meta data
|
# stringification of meta data
|
||||||
|
@ -80,19 +80,6 @@ include_directories("${PROJECT_BINARY_DIR}")
|
||||||
|
|
||||||
# add windows resource file
|
# add windows resource file
|
||||||
if(MINGW)
|
if(MINGW)
|
||||||
# creation windows icon from png with ffmpeg if available
|
|
||||||
find_program(FFMPEG_BIN ffmpeg avconv)
|
|
||||||
if(FFMPEG_BIN)
|
|
||||||
set(PNG_ICON_PATH "${PROJECT_SOURCE_DIR}/resources/icons/hicolor/128x128/apps/${META_PROJECT_NAME}.png")
|
|
||||||
if(EXISTS ${PNG_ICON_PATH})
|
|
||||||
set(WINDOWS_ICON_PATH "${PROJECT_BINARY_DIR}/${META_PROJECT_NAME}.ico")
|
|
||||||
set(WINDOWS_ICON_RC_ENTRY "IDI_ICON1 ICON DISCARDABLE \"${WINDOWS_ICON_PATH}\"")
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT "${WINDOWS_ICON_PATH}"
|
|
||||||
COMMAND ${FFMPEG_BIN} -y -i "${PNG_ICON_PATH}" -vf crop=iw-20:ih-20:10:10,scale=64:64 "${WINDOWS_ICON_PATH}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif(FFMPEG_BIN)
|
|
||||||
# create windows rc file from template
|
# create windows rc file from template
|
||||||
set(WINDOWS_EXT "dll")
|
set(WINDOWS_EXT "dll")
|
||||||
configure_file(
|
configure_file(
|
||||||
|
|
|
@ -3,7 +3,7 @@ projectname = c++utilities
|
||||||
appname = "C++ Utilities"
|
appname = "C++ Utilities"
|
||||||
appauthor = Martchus
|
appauthor = Martchus
|
||||||
QMAKE_TARGET_DESCRIPTION = "Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities."
|
QMAKE_TARGET_DESCRIPTION = "Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities."
|
||||||
VERSION = 3.1.0
|
VERSION = 3.1.1
|
||||||
|
|
||||||
# include ../../common.pri when building as part of a subdirs project; otherwise include general.pri
|
# include ../../common.pri when building as part of a subdirs project; otherwise include general.pri
|
||||||
!include(../../common.pri) {
|
!include(../../common.pri) {
|
||||||
|
|
Loading…
Reference in New Issue