From 752cd3f18be22bd005e26a7a5da0144169d84042 Mon Sep 17 00:00:00 2001 From: Fei Chong Date: Tue, 16 Jun 2020 18:52:26 +0800 Subject: [PATCH 1/4] Update generate_product_version.cmake --- generate_product_version.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/generate_product_version.cmake b/generate_product_version.cmake index 5e992dd..c76c22f 100644 --- a/generate_product_version.cmake +++ b/generate_product_version.cmake @@ -92,8 +92,9 @@ function(generate_product_version outfiles) set(PRODUCT_FILE_DESCRIPTION "${PRODUCT_NAME}") endif() - set (_VersionInfoFile ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.h) - set (_VersionResourceFile ${CMAKE_CURRENT_BINARY_DIR}/VersionResource.rc) + set (_VersionInfoFile ${CMAKE_CURRENT_BINARY_DIR}/${PRODUCT_NAME}_VersionInfo.h) + set (_VersionResourceFile ${CMAKE_CURRENT_BINARY_DIR}/${PRODUCT_NAME}_VersionResource.rc) + set(PRODUCT_VERSION_HEADER ${_VersionInfoFile}) configure_file( ${GenerateProductVersionCurrentDir}/VersionInfo.in ${_VersionInfoFile} @@ -101,7 +102,7 @@ function(generate_product_version outfiles) configure_file( ${GenerateProductVersionCurrentDir}/VersionResource.rc ${_VersionResourceFile} - COPYONLY) + @ONLY) list(APPEND ${outfiles} ${_VersionInfoFile} ${_VersionResourceFile}) set (${outfiles} ${${outfiles}} PARENT_SCOPE) endfunction() From bf1ad711653253055979e0901864d875963d20e0 Mon Sep 17 00:00:00 2001 From: Fei Chong Date: Tue, 16 Jun 2020 18:52:57 +0800 Subject: [PATCH 2/4] Update VersionResource.rc --- VersionResource.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VersionResource.rc b/VersionResource.rc index d2b0772..3471b95 100644 --- a/VersionResource.rc +++ b/VersionResource.rc @@ -1,4 +1,4 @@ -#include "VersionInfo.h" +#include "@PRODUCT_VERSION_HEADER@" #if defined(__MINGW64__) || defined(__MINGW32__) // MinGW-w64, MinGW From 95da00b65a06438c4f68a3878accdb35ab031d80 Mon Sep 17 00:00:00 2001 From: Fei Chong Date: Tue, 16 Jun 2020 18:53:58 +0800 Subject: [PATCH 3/4] Update generate_product_version.cmake --- generate_product_version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate_product_version.cmake b/generate_product_version.cmake index c76c22f..28d7fc6 100644 --- a/generate_product_version.cmake +++ b/generate_product_version.cmake @@ -4,7 +4,7 @@ set (GenerateProductVersionCurrentDir ${CMAKE_CURRENT_LIST_DIR}) # generate_product_version() function # -# This function uses VersionInfo.in template file and VersionResource.rc file +# This function uses ${NAME}_VersionInfo.in template file and ${NAME}_VersionResource.rc file # to generate WIN32 resource with version information and general resource strings. # # Usage: From 8ee32afaf29fd43defeba87e5a28488c555f905f Mon Sep 17 00:00:00 2001 From: Fei Chong Date: Tue, 16 Jun 2020 18:57:26 +0800 Subject: [PATCH 4/4] Update generate_product_version.cmake --- generate_product_version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate_product_version.cmake b/generate_product_version.cmake index 28d7fc6..c76c22f 100644 --- a/generate_product_version.cmake +++ b/generate_product_version.cmake @@ -4,7 +4,7 @@ set (GenerateProductVersionCurrentDir ${CMAKE_CURRENT_LIST_DIR}) # generate_product_version() function # -# This function uses ${NAME}_VersionInfo.in template file and ${NAME}_VersionResource.rc file +# This function uses VersionInfo.in template file and VersionResource.rc file # to generate WIN32 resource with version information and general resource strings. # # Usage: