From 4a55cd63141e23d3c599c4071a5f882936c30e77 Mon Sep 17 00:00:00 2001 From: David Faure Date: Fri, 10 Jan 2014 09:51:05 +0100 Subject: Rename ECM_VERSION_* to PROJECT_VERSION_* to avoid confusion with ECM's own version This is all internal, doesn't change the API or effects of ecm_setup_version. --- modules/ECMSetupVersion.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'modules/ECMSetupVersion.cmake') diff --git a/modules/ECMSetupVersion.cmake b/modules/ECMSetupVersion.cmake index 2ce761ad..6c3a9959 100644 --- a/modules/ECMSetupVersion.cmake +++ b/modules/ECMSetupVersion.cmake @@ -73,12 +73,13 @@ function(ECM_SETUP_VERSION _version) set(${ESV_VARIABLE_PREFIX}_SOVERSION ${ESV_SOVERSION}) set(${ESV_VARIABLE_PREFIX}_VERSION_STRING "${_version}") + set(PROJECT_VERSION_STRING "${${ESV_VARIABLE_PREFIX}_VERSION_STRING}") + set(PROJECT_VERSION_MAJOR "${${ESV_VARIABLE_PREFIX}_VERSION_MAJOR}") + set(PROJECT_VERSION_MINOR "${${ESV_VARIABLE_PREFIX}_VERSION_MINOR}") + set(PROJECT_VERSION_PATCH "${${ESV_VARIABLE_PREFIX}_VERSION_PATCH}") + if(ESV_VERSION_HEADER) set(PROJECT_NAME_UPPER "${ESV_VARIABLE_PREFIX}") - set(ECM_VERSION_STRING "${${ESV_VARIABLE_PREFIX}_VERSION_STRING}") - set(ECM_VERSION_MAJOR "${${ESV_VARIABLE_PREFIX}_VERSION_MAJOR}") - set(ECM_VERSION_MINOR "${${ESV_VARIABLE_PREFIX}_VERSION_MINOR}") - set(ECM_VERSION_PATCH "${${ESV_VARIABLE_PREFIX}_VERSION_PATCH}") configure_file("${ECM_MODULE_DIR}/ECMVersionHeader.h.in" "${ESV_VERSION_HEADER}") endif() -- cgit v1.2.1