Commit 32482fde authored by cyrush's avatar cyrush

change Info.plist for viewer + gui OSX bundles to support HighDPI text (retinia) displays

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23696 18c085ea-50e0-402c-830e-de6fd14e8384
parent baddbe87
......@@ -91,6 +91,8 @@ ELSE(NOT APPLE)
ENDIF(VISIT_STATIC)
ADD_EXECUTABLE(gui_exe MACOSX_BUNDLE main.C ${GUI_STATIC_SOURCES} ${VISIT_SOURCE_DIR}/common/icons/${GUI_ICON_FILE})
SET_TARGET_PROPERTIES( gui_exe PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${VISIT_SOURCE_DIR}/include/GUIInfo.plist.in)
SET(MACOSX_BUNDLE_BUNDLE_NAME "VisIt ${VISIT_VERSION}")
SET(MACOSX_BUNDLE_INFO_STRING "Graphical client for VisIt")
SET(MACOSX_BUNDLE_ICON_FILE ${GUI_ICON_FILE})
......@@ -99,6 +101,7 @@ ELSE(NOT APPLE)
SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "VisIt ${VISIT_VERSION}")
SET(MACOSX_BUNDLE_BUNDLE_VERSION ${VISIT_VERSION})
SET(MACOSX_BUNDLE_COPYRIGHT "Copyright (c) 2000 - 2013, Lawrence Livermore National Security, LLC")
ENDIF(NOT APPLE)
SET_TARGET_PROPERTIES(gui_exe PROPERTIES OUTPUT_NAME gui)
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundleIdentifier</key>
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key>
<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<key>NSHighResolutionCapable</key>
<string>True</string>
</dict>
</plist>
......@@ -2,37 +2,41 @@
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>viewer</string>
<key>CFBundleGetInfoString</key>
<string>Graphical viewer for VisIt</string>
<key>CFBundleIconFile</key>
<string>VisItIcon.icns</string>
<key>CFBundleIdentifier</key>
<string>VISV</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>VisIt version @VISIT_VERSION@</string>
<key>CFBundleName</key>
<string>VisIt Viewer @VISIT_VERSION@</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>VisIt @VISIT_VERSION@</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>@VISIT_VERSION@</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>LSUIElement</key>
<string>1</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2000 - 2013, Lawrence Livermore National Security, LLC</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>viewer</string>
<key>CFBundleGetInfoString</key>
<string>Graphical viewer for VisIt</string>
<key>CFBundleIconFile</key>
<string>VisItIcon.icns</string>
<key>CFBundleIdentifier</key>
<string>VISV</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>VisIt version @VISIT_VERSION@</string>
<key>CFBundleName</key>
<string>VisIt Viewer @VISIT_VERSION@</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>VisIt @VISIT_VERSION@</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>@VISIT_VERSION@</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>
<true/>
<key>LSUIElement</key>
<string>1</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2000 - 2013, Lawrence Livermore National Security, LLC</string>
<key>NSHighResolutionCapable</key>
<string>True</string>
</dict>
</plist>
......@@ -255,11 +255,18 @@ ELSE(NOT APPLE)
MACOSX_PACKAGE_LOCATION Resources
)
CONFIGURE_FILE(${VISIT_SOURCE_DIR}/include/ViewerInfo.plist.in
${VISIT_BINARY_DIR}/include/ViewerInfo.plist @ONLY IMMEDIATE)
ADD_EXECUTABLE(viewer_exe MACOSX_BUNDLE viewer.C ${VIEWER_STATIC_SOURCES} ${VISIT_SOURCE_DIR}/common/icons/${VIEWER_ICON_FILE})
SET_TARGET_PROPERTIES(viewer_exe PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${VISIT_BINARY_DIR}/include/ViewerInfo.plist)
SET_TARGET_PROPERTIES( viewer_exe PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${VISIT_SOURCE_DIR}/include/ViewerInfo.plist.in)
SET(MACOSX_BUNDLE_BUNDLE_NAME "VisIt ${VISIT_VERSION}")
SET(MACOSX_BUNDLE_INFO_STRING "Graphical viewer for VisIt")
SET(MACOSX_BUNDLE_ICON_FILE ${GUI_ICON_FILE})
SET(MACOSX_BUNDLE_GUI_IDENTIFIER VISI)
SET(MACOSX_BUNDLE_LONG_VERSION_STRING "VisIt version ${VISIT_VERSION}")
SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "VisIt ${VISIT_VERSION}")
SET(MACOSX_BUNDLE_BUNDLE_VERSION ${VISIT_VERSION})
SET(MACOSX_BUNDLE_COPYRIGHT "Copyright (c) 2000 - 2013, Lawrence Livermore National Security, LLC")
IF(VISIT_STATIC)
MAC_NIB_INSTALL(viewer)
ENDIF(VISIT_STATIC)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment