Skip to content

Fix warnings RC4005: 'UMF_VERSION' : redefinition #621

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
merged 1 commit into from
Jul 19, 2024
Merged

Fix warnings RC4005: 'UMF_VERSION' : redefinition #621

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions src/libumf.rc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "umf/base.h"

#define UMF_VERNUMBERS @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@UMF_VERSION_REVISION@
#define UMF_VERSION "@UMF_VERSION@"
#define _UMF_VERSION "@UMF_VERSION@"

#ifdef _DEBUG
#define VERSION_DEBUG VS_FF_DEBUG
Expand Down Expand Up @@ -50,12 +50,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Intel Corporation\0"
VALUE "FileDescription", "Unified Memory Framework (UMF) library\0"
VALUE "FileVersion", UMF_VERSION "\0"
VALUE "FileVersion", _UMF_VERSION "\0"
VALUE "LegalCopyright", "Copyright 2024, Intel Corporation. All rights reserved.\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "umf.dll\0"
VALUE "ProductName", "Unified Memory Framework (UMF)\0"
VALUE "ProductVersion", UMF_VERSION "\0"
VALUE "ProductVersion", _UMF_VERSION "\0"
VALUE "PrivateBuild", "\0"
VALUE "SpecialBuild", "\0"
END
Expand Down
6 changes: 3 additions & 3 deletions src/proxy_lib/proxy_lib.rc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "umf/base.h"

#define UMF_VERNUMBERS @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@UMF_VERSION_REVISION@
#define UMF_VERSION "@UMF_VERSION@"
#define _UMF_VERSION "@UMF_VERSION@"

#ifdef _DEBUG
#define VERSION_DEBUG VS_FF_DEBUG
Expand Down Expand Up @@ -50,12 +50,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Intel Corporation\0"
VALUE "FileDescription", "Unified Memory Framework (UMF) proxy library\0"
VALUE "FileVersion", UMF_VERSION "\0"
VALUE "FileVersion", _UMF_VERSION "\0"
VALUE "LegalCopyright", "Copyright 2024, Intel Corporation. All rights reserved.\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "umf_proxy.dll\0"
VALUE "ProductName", "Unified Memory Framework (UMF)\0"
VALUE "ProductVersion", UMF_VERSION "\0"
VALUE "ProductVersion", _UMF_VERSION "\0"
VALUE "PrivateBuild", "\0"
VALUE "SpecialBuild", "\0"
END
Expand Down