From 3d220841c01037af77b5299ea029144e3795242f Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 2 Aug 2015 15:45:25 -1000 Subject: [PATCH] version macro fix --- atdna/atdnaConfigVersion.cmake.in | 2 +- atdna/main.rc.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/atdna/atdnaConfigVersion.cmake.in b/atdna/atdnaConfigVersion.cmake.in index 84060cc..93e6ac6 100644 --- a/atdna/atdnaConfigVersion.cmake.in +++ b/atdna/atdnaConfigVersion.cmake.in @@ -1,4 +1,4 @@ -set(PACKAGE_VERSION "@ATDNA_VERSION@") +set(PACKAGE_VERSION "@ATHENA_VERSION@") # Check whether the requested PACKAGE_FIND_VERSION is compatible if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") diff --git a/atdna/main.rc.in b/atdna/main.rc.in index f25a1f2..01dcf56 100644 --- a/atdna/main.rc.in +++ b/atdna/main.rc.in @@ -3,8 +3,8 @@ IDI_ICON1 ICON DISCARDABLE "@ATHENA_ICO@" VS_VERSION_INFO VERSIONINFO - FILEVERSION @ATDNA_MAJOR_VERSION@,@ATDNA_MINOR_VERSION@,@ATDNA_PATCH_VERSION@,0 - PRODUCTVERSION @ATDNA_MAJOR_VERSION@,@ATDNA_MINOR_VERSION@,@ATDNA_PATCH_VERSION@,0 + FILEVERSION @ATHENA_MAJOR_VERSION@,@ATHENA_MINOR_VERSION@,@ATHENA_PATCH_VERSION@,0 + PRODUCTVERSION @ATHENA_MAJOR_VERSION@,@ATHENA_MINOR_VERSION@,@ATHENA_PATCH_VERSION@,0 FILEFLAGS 0x0L FILEFLAGSMASK 0x3fL FILEOS 0x00040004L @@ -17,12 +17,12 @@ BEGIN BEGIN VALUE "CompanyName", "Jackoalan / Antidote" VALUE "FileDescription", "ATDNA" - VALUE "FileVersion", "@ATDNA_MAJOR_VERSION@.@ATDNA_MINOR_VERSION@.@ATDNA_PATCH_VERSION@" + VALUE "FileVersion", "@ATHENA_MAJOR_VERSION@.@ATHENA_MINOR_VERSION@.@ATHENA_PATCH_VERSION@" VALUE "LegalCopyright", "Copyright (C) 2015 Jackoalan / Antidote" VALUE "InternalName", "atdna" VALUE "OriginalFilename", "atdna.exe" VALUE "ProductName", "ATDNA" - VALUE "ProductVersion", "@ATDNA_MAJOR_VERSION@.@ATDNA_MINOR_VERSION@.@ATDNA_PATCH_VERSION@" + VALUE "ProductVersion", "@ATHENA_MAJOR_VERSION@.@ATHENA_MINOR_VERSION@.@ATHENA_PATCH_VERSION@" END END BLOCK "VarFileInfo"