Fix 'OriginalFilename' in Windows RC file
Rely on generator expressions to get the correct filename. This has never worked because WINDOWS_EXT was usually only set after WindowsResources has been included.
This commit is contained in:
parent
47850ace49
commit
534aaf0b4d
|
@ -19,7 +19,8 @@ endif ()
|
||||||
# find rc template, define path of output rc file
|
# find rc template, define path of output rc file
|
||||||
include(TemplateFinder)
|
include(TemplateFinder)
|
||||||
find_template_file("windows.rc" CPP_UTILITIES RC_TEMPLATE_FILE)
|
find_template_file("windows.rc" CPP_UTILITIES RC_TEMPLATE_FILE)
|
||||||
set(WINDOWS_RC_FILE "${CMAKE_CURRENT_BINARY_DIR}/resources/windows.rc")
|
set(WINDOWS_RC_FILE_CFG "${CMAKE_CURRENT_BINARY_DIR}/resources/windows.rc.configured")
|
||||||
|
set(WINDOWS_RC_FILE "${CMAKE_CURRENT_BINARY_DIR}/resources/windows")
|
||||||
|
|
||||||
# create Windows icon from png with ffmpeg if available
|
# create Windows icon from png with ffmpeg if available
|
||||||
unset(WINDOWS_ICON_PATH)
|
unset(WINDOWS_ICON_PATH)
|
||||||
|
@ -54,10 +55,12 @@ if (WINDOWS_ICON_ENABLED)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
# create Windows rc file from template
|
# create Windows rc file from template
|
||||||
configure_file("${RC_TEMPLATE_FILE}" "${WINDOWS_RC_FILE}")
|
configure_file("${RC_TEMPLATE_FILE}" "${WINDOWS_RC_FILE}-configured.rc")
|
||||||
|
file(GENERATE OUTPUT "${WINDOWS_RC_FILE}-$<CONFIG>.rc" INPUT "${WINDOWS_RC_FILE}-configured.rc")
|
||||||
|
|
||||||
# set windres as resource compiler
|
# set windres as resource compiler
|
||||||
list(APPEND RES_FILES "${WINDOWS_RC_FILE}")
|
list(APPEND RES_FILES "${WINDOWS_RC_FILE}-${CMAKE_BUILD_TYPE}.rc")
|
||||||
|
set_property(SOURCE "${WINDOWS_RC_FILE}-${CMAKE_BUILD_TYPE}.rc" APPEND PROPERTY GENERATED ON)
|
||||||
set(CMAKE_RC_COMPILER_INIT windres)
|
set(CMAKE_RC_COMPILER_INIT windres)
|
||||||
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
|
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
|
||||||
enable_language(RC)
|
enable_language(RC)
|
||||||
|
|
|
@ -27,7 +27,7 @@ VS_VERSION_INFO VERSIONINFO
|
||||||
VALUE "FileDescription", "@META_APP_DESCRIPTION@\0"
|
VALUE "FileDescription", "@META_APP_DESCRIPTION@\0"
|
||||||
VALUE "FileVersion", "@META_APP_VERSION@\0"
|
VALUE "FileVersion", "@META_APP_VERSION@\0"
|
||||||
VALUE "LegalCopyright", "by @META_APP_AUTHOR@\0"
|
VALUE "LegalCopyright", "by @META_APP_AUTHOR@\0"
|
||||||
VALUE "OriginalFilename", "@META_PROJECT_NAME@@WINDOWS_EXT@\0"
|
VALUE "OriginalFilename", "$<TARGET_FILE_NAME:@TARGET_PREFIX@@META_PROJECT_NAME@@TARGET_SUFFIX@>\0"
|
||||||
VALUE "ProductName", "@META_APP_NAME@\0"
|
VALUE "ProductName", "@META_APP_NAME@\0"
|
||||||
VALUE "ProductVersion", "@META_APP_VERSION@\0"
|
VALUE "ProductVersion", "@META_APP_VERSION@\0"
|
||||||
END
|
END
|
||||||
|
|
Loading…
Reference in New Issue