diff options
| author | Charles Giessen <charles@lunarg.com> | 2023-01-25 14:20:40 -0700 |
|---|---|---|
| committer | Charles Giessen <46324611+charles-lunarg@users.noreply.github.com> | 2023-01-25 16:33:24 -0700 |
| commit | 50d9f72d492bb4e1f20fd2240bb8332e4fbbfd2a (patch) | |
| tree | 39b523a7fce03dafad43b2d93e2cab9eaf067c37 | |
| parent | 36464b5cf9ade4e412aacd06d95cb02857021bba (diff) | |
| download | usermoji-50d9f72d492bb4e1f20fd2240bb8332e4fbbfd2a.tar.xz | |
vulkaninfo: Fix rc file copyright and other mistakes
The copyright went out of date in 2022 but was never updated. As a precaution
for the future, the copyright will now be the current year the file was created
in, rather than being hardcoded.
| -rw-r--r-- | vulkaninfo/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | vulkaninfo/vulkaninfo.rc.in | 11 |
2 files changed, 14 insertions, 12 deletions
diff --git a/vulkaninfo/CMakeLists.txt b/vulkaninfo/CMakeLists.txt index 88be7a19..d23dcf89 100644 --- a/vulkaninfo/CMakeLists.txt +++ b/vulkaninfo/CMakeLists.txt @@ -1,6 +1,6 @@ # ~~~ -# Copyright (c) 2018-2019 Valve Corporation -# Copyright (c) 2018-2019 LunarG, Inc. +# Copyright (c) 2018-2023 Valve Corporation +# Copyright (c) 2018-2023 LunarG, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,17 +21,18 @@ if(WIN32) # ~~~ # Setup the vulkaninfo.rc file to contain the correct info # Optionally uses the VULKANINFO_BUILD_DLL_VERSIONINFO build option to allow setting the exact build version - # When VULKANINFO_BUILD_DLL_VERSIONINFO is not provided, "Dev Build" is added to the version string + # When VULKANINFO_BUILD_DLL_VERSIONINFO is not provided, "Dev Build" is added to the version strings # ~~~ + string(TIMESTAMP CURRENT_YEAR "%Y") + set(VULKANINFO_CUR_COPYRIGHT_STR "${CURRENT_YEAR}") if ("$CACHE{VULKANINFO_BUILD_DLL_VERSIONINFO}" STREQUAL "") - # Default version - for when no version is provided - set(VULKANINFO_RC_VERSION "1.0.1111.2222") + set(VULKANINFO_RC_VERSION "${VulkanHeaders_VERSION}") set(VULKANINFO_VER_FILE_VERSION_STR "\"${VULKANINFO_RC_VERSION}.Dev Build\"") - set(VULKANINFO_VER_FILE_DESCRIPTION_STR "\"Vulkan Loader - Dev Build\"") + set(VULKANINFO_VER_FILE_DESCRIPTION_STR "\"Vulkaninfo - Dev Build\"") else() set(VULKANINFO_RC_VERSION "$CACHE{VULKANINFO_BUILD_DLL_VERSIONINFO}") set(VULKANINFO_VER_FILE_VERSION_STR "\"${VULKANINFO_RC_VERSION}\"") - set(VULKANINFO_VER_FILE_DESCRIPTION_STR "\"Vulkan Loader\"") + set(VULKANINFO_VER_FILE_DESCRIPTION_STR "\"vulkaninfo\"") endif() # RC file wants the value of FILEVERSION to separated by commas diff --git a/vulkaninfo/vulkaninfo.rc.in b/vulkaninfo/vulkaninfo.rc.in index ef976928..dd5562f5 100644 --- a/vulkaninfo/vulkaninfo.rc.in +++ b/vulkaninfo/vulkaninfo.rc.in @@ -1,7 +1,7 @@ // -// Copyright (c) 2018-2019 The Khronos Group Inc. -// Copyright (c) 2018-2019 Valve Corporation -// Copyright (c) 2018-2019 LunarG, Inc. +// Copyright (c) 2018-2023 The Khronos Group Inc. +// Copyright (c) 2018-2023 Valve Corporation +// Copyright (c) 2018-2023 LunarG, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ #define VER_FILE_VERSION ${VULKANINFO_VER_FILE_VERSION} #define VER_FILE_VERSION_STR ${VULKANINFO_VER_FILE_VERSION_STR} #define VER_FILE_DESCRIPTION_STR ${VULKANINFO_VER_FILE_DESCRIPTION_STR} +#define VER_COPYRIGHT_STR "Copyright (C) 2015-${VULKANINFO_CUR_COPYRIGHT_STR}" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILE_VERSION @@ -45,8 +46,8 @@ BEGIN BEGIN VALUE "FileDescription", VER_FILE_DESCRIPTION_STR VALUE "FileVersion", VER_FILE_VERSION_STR - VALUE "LegalCopyright", "Copyright (C) 2015-2021" - VALUE "ProductName", "Vulkan Runtime" + VALUE "LegalCopyright", VER_COPYRIGHT_STR + VALUE "ProductName", "Vulkaninfo" VALUE "ProductVersion", VER_FILE_VERSION_STR END END |