diff --git a/project.cmake b/project.cmake index 4816b141..07e1692b 100644 --- a/project.cmake +++ b/project.cmake @@ -3,7 +3,7 @@ set(REPERTORY_MINOR 0) set(REPERTORY_REV 2) set(REPERTORY_RELEASE_NUM 0) set(REPERTORY_RELEASE_ITER rc) -set(REPERTORY_VERSION ${REPERTORY_MAJOR}.${REPERTORY_MINOR}.${REPERTORY_REV}-${REPERTORY_RELEASE_ITER}) +set(PROJECT_VERSION ${REPERTORY_MAJOR}.${REPERTORY_MINOR}.${REPERTORY_REV}-${REPERTORY_RELEASE_ITER}) set(REPERTORY_VER_FILEVERSION ${REPERTORY_MAJOR},${REPERTORY_MINOR},${REPERTORY_REV},${REPERTORY_RELEASE_NUM}) set(REPERTORY_VER_FILEVERSION_STR ${REPERTORY_MAJOR}.${REPERTORY_MINOR}.${REPERTORY_REV}.${REPERTORY_RELEASE_NUM}) diff --git a/repertory/librepertory/src/common.cpp.in b/repertory/librepertory/src/common.cpp.in index d66b8762..1a6eedd1 100644 --- a/repertory/librepertory/src/common.cpp.in +++ b/repertory/librepertory/src/common.cpp.in @@ -29,7 +29,7 @@ auto get_repertory_git_revision() -> const std::string & { } auto get_repertory_version() -> const std::string & { - static const std::string version = "@REPERTORY_VERSION@"; + static const std::string version = "@PROJECT_VERSION@"; return version; } } // namespace repertory diff --git a/repertory/repertory/version.rc.in b/repertory/repertory/version.rc.in index cb622188..dab93271 100644 --- a/repertory/repertory/version.rc.in +++ b/repertory/repertory/version.rc.in @@ -6,13 +6,13 @@ #define VER_PRODUCTVERSION_STR "@REPERTORY_VER_PRODUCTVERSION_STR@\0" #define VER_COMPANYNAME_STR "@REPERTORY_VER_COMPANYNAME_STR@\0" -#define VER_INTERNALNAME_STR "Repertory @REPERTORY_VERSION@\0" +#define VER_INTERNALNAME_STR "Repertory @PROJECT_VERSION@\0" #define VER_LEGALCOPYRIGHT_STR "@REPERTORY_VER_LEGALCOPYRIGHT_STR@\0" #define VER_ORIGINALFILENAME_STR "repertory.exe\0" #define VER_LEGALTRADEMARKS1_STR "\0" #define VER_LEGALTRADEMARKS2_STR "\0" #define VER_FILEDESCRIPTION_STR "@REPERTORY_VER_FILEDESCRIPTION_STR@\0" -#define VER_PRODUCTNAME_STR "Repertory v@REPERTORY_VERSION@\0" +#define VER_PRODUCTNAME_STR "Repertory @PROJECT_VERSION@\0" #ifdef DEBUG #define VER_DEBUG VS_FF_DEBUG