diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 7ed2a7d82..bbf77c644 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -17,7 +17,6 @@ cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
 # can be removed when we use full paths for all libraries.
 cmake_policy(SET CMP0003 OLD)
 if(NOT (CMAKE_MAJOR_VERSION LESS 3))
-cmake_policy(SET CMP0048 OLD)
 cmake_policy(SET CMP0026 OLD)
 endif(NOT (CMAKE_MAJOR_VERSION LESS 3))
 
@@ -31,7 +30,6 @@ include(Variables)
 
 # Load versions now.  Install locations need them.
 include(BuildVersion)
-
 include(UnixInstall)
 
 if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake
index 54ae4b152..457a1bb16 100644
--- a/indra/cmake/BuildVersion.cmake
+++ b/indra/cmake/BuildVersion.cmake
@@ -70,13 +70,12 @@ if (LINUX)
    )
 endif (LINUX)
 
-# Compose the version.
-set(viewer_VERSION "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}")
-if (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
-  message(STATUS "Version is ${viewer_VERSION}")
-else (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
-  message(FATAL_ERROR "Could not determine version (${viewer_VERSION})")
-endif (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
 
-# Report version to caller.
-#set(viewer_VERSION "${viewer_VERSION}" PARENT_SCOPE)
+# Compose the version.
+set(${ROOT_PROJECT_NAME}_VERSION "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}")
+if (${ROOT_PROJECT_NAME}_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+  message(STATUS "Version is ${${ROOT_PROJECT_NAME}_VERSION}")
+else (${ROOT_PROJECT_NAME}_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+  message(FATAL_ERROR "Could not determine version (${${ROOT_PROJECT_NAME}_VERSION})")
+endif (${ROOT_PROJECT_NAME}_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+
diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake
index 630999d80..f566aad3d 100644
--- a/indra/cmake/UnixInstall.cmake
+++ b/indra/cmake/UnixInstall.cmake
@@ -11,6 +11,6 @@ if (INSTALL)
     set(APP_BIN_DIR bin)
   endif(NOT APP_BIN_DIR)
   if(NOT APP_SHARE_DIR)
-    set(APP_SHARE_DIR share/secondlife-${viewer_VERSION})
+    set(APP_SHARE_DIR share/secondlife-${${ROOT_PROJECT_NAME}_VERSION})
   endif(NOT APP_SHARE_DIR)
 endif (INSTALL)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index aa679e99f..e49889db3 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1632,7 +1632,7 @@ if (LINUX)
       DEPENDS ${VIEWER_BINARY_NAME}
       )
 
-  set(product ${VIEWER_BRANDING_NAME_CAMELCASE}-${ARCH}-${viewer_VERSION})
+  set(product ${VIEWER_BRANDING_NAME_CAMELCASE}-${ARCH}-${${ROOT_PROJECT_NAME}_VERSION})
 
   add_custom_command(
       OUTPUT ${product}.tar.bz2
@@ -1700,10 +1700,10 @@ if (DARWIN)
     MACOSX_BUNDLE_INFO_STRING "A stable third-party Second Life viewer."
     MACOSX_BUNDLE_ICON_FILE "${VIEWER_BRANDING_ID}_icon.icns"
     MACOSX_BUNDLE_GUI_IDENTIFIER "${VIEWER_BRANDING_NAME}"
-    MACOSX_BUNDLE_LONG_VERSION_STRING "${viewer_VERSION}"
+    MACOSX_BUNDLE_LONG_VERSION_STRING "${${ROOT_PROJECT_NAME}_VERSION}"
     MACOSX_BUNDLE_BUNDLE_NAME "${VIEWER_BRANDING_NAME}"
-    MACOSX_BUNDLE_SHORT_VERSION_STRING "${viewer_VERSION}"
-    MACOSX_BUNDLE_BUNDLE_VERSION "${viewer_VERSION}"
+    MACOSX_BUNDLE_SHORT_VERSION_STRING "${${ROOT_PROJECT_NAME}_VERSION}"
+    MACOSX_BUNDLE_BUNDLE_VERSION "${${ROOT_PROJECT_NAME}_VERSION}"
     MACOSX_BUNDLE_COPYRIGHT "Copyright 2013 Siana Gearz"
     )