Skip to content
This repository has been archived by the owner on Jun 21, 2022. It is now read-only.

Commit

Permalink
FIX: Include the qt_menu.nib in the App-bundle if using Qt-Cocoa.
Browse files Browse the repository at this point in the history
Can't put it in the QtGui.framework, because the bundle utilities don't
create the Current symlink, and that is the place under which Qt
searches in the framework. So it is placed in the App-bundle's Resources
folder.

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
  • Loading branch information
wildmichael committed Feb 8, 2010
1 parent 4c9da6d commit f2c5d7e
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions CMake/ParaViewBranding.cmake
Expand Up @@ -132,6 +132,23 @@ FUNCTION(build_paraview_client BPC_NAME)
PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
)
IF(QT_MAC_USE_COCOA)
GET_FILENAME_COMPONENT(qt_menu_nib
"@QT_QTGUI_LIBRARY_RELEASE@/Resources/qt_menu.nib"
REALPATH)
set(qt_menu_nib_sources
"${qt_menu_nib}/classes.nib"
"${qt_menu_nib}/info.nib"
"${qt_menu_nib}/keyedobjects.nib"
)
SET_SOURCE_FILES_PROPERTIES(
${qt_menu_nib_sources}
PROPERTIES
MACOSX_PACKAGE_LOCATION Resources/qt_menu.nib
)
ELSE(QT_MAC_USE_COCOA)
set(qt_menu_nib_sources)
ENDIF(QT_MAC_USE_COCOA)
ENDIF (BPC_BUNDLE_ICON)
SET(MAKE_BUNDLE MACOSX_BUNDLE)
ENDIF (APPLE)
Expand Down Expand Up @@ -248,6 +265,7 @@ FUNCTION(build_paraview_client BPC_NAME)
${BPC_NAME}_main.cxx
${exe_icon}
${apple_bundle_sources}
${qt_menu_nib_sources}
${EXE_SRCS}
)
SET (pv_exe_name ${BPC_NAME}${pv_exe_suffix})
Expand Down

2 comments on commit f2c5d7e

@partyd
Copy link

@partyd partyd commented on f2c5d7e Feb 9, 2010

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Mike I just committed your patch. I'll keep an eye on the dashboards/mailing list to see if anyone has any issues. Thanks!

@wildmichael
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great! Hope it works as it should...

Please sign in to comment.