Fixed CMP0048 properly.

This commit is contained in:
Shyotl
2014-12-26 23:51:05 -06:00
parent 00123d2dde
commit b3bd91877c
4 changed files with 13 additions and 16 deletions

View File

@@ -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"
)