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

Commit

Permalink
FIX: Include libQtCLucene.dylib and libqsqlite.dylib in the bundle
Browse files Browse the repository at this point in the history 
Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
  • Loading branch information
@wildmichael
wildmichael committed Feb 8, 2010
1 parent 7eb9e34 commit f07cdfd
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions Applications/ParaView/CompleteBundle.cmake.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ function(gp_item_default_embedded_path_override item default_embedded_path_var)
set(path "@executable_path/../Plugins")
endif(item MATCHES "Plugin\\.dylib$")

# ...embed libqsqlite.dylib in the Plugins/sqldrivers folder:
#
if(item MATCHES "libqsqlite\\.dylib$")
set(path "@executable_path/../Plugins/sqldrivers")
endif(item MATCHES "libqsqlite\\.dylib$")

# ...embed *.so in the Plugins folder:
#
if(item MATCHES "\\.so$")
Expand Down Expand Up @@ -92,6 +98,7 @@ set (PluginList)
foreach (pluginname ${packaged_plugin_names})
list (APPEND PluginList "@EXECUTABLE_OUTPUT_PATH@/lib${pluginname}.dylib")
endforeach()
list(APPEND PluginList "@QT_PLUGINS_DIR@/sqldrivers/libqsqlite.dylib")

# GLOB the list of Python.so files (treat them like plugins, too, for
# fixup_bundle purposes since they will not be pulled in automatically
Expand All @@ -109,6 +116,19 @@ if(FFMPEG_avcodec_LIBRARY)
set(libs_path ${libs_path} ${ffmpeg_lib_path})
endif()

set(QT_QTCLUCENE_LIBRARY "@QT_QTCLUCENE_LIBRARY@")
if(QT_QTCLUCENE_LIBRARY)
foreach(i ${QT_QTCLUCENE_LIBRARY})
if(i MATCHES ".*\\.dylib$")
get_filename_component(qtlucene_lib_path "${i}" PATH)
list(APPEND libs_path ${qtlucene_lib_path})
endif()
endforeach(i)
endif()

list(APPEND libs_path "@QT_PLUGINS_DIR@/sqldrivers")

list(REMOVE_DUPLICATES libs_path)

# Fix it!
#
Expand Down

3 comments on commit f07cdfd

@partyd
Copy link

@partyd partyd commented on f07cdfd Mar 17, 2010

Choose a reason for hiding this comment

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

Applied and commited now.

PS C:\Kitware\ParaView3\src\Applications\ParaView> cvs commit -m "BUG: apply fix from Mike Jackson to include libQtCLucene.dylib and lib
qsqlist.dylib in the bundle."
cvs commit: Examining .
cvs commit: Examining Testing
cvs commit: Examining Testing/Python
cvs commit: Examining Testing/XML
Committer: Dave Partyka
/cvsroot/ParaView3/ParaView3/Applications/ParaView/CompleteBundle.cmake.in,v <-- CompleteBundle.cmake.in
new revision: 1.2; previous revision: 1.1

@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! Only one small thing: I'm not Mike Jackson... ;-)

@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.

Oh, and of course the whole thing could be solved much more elegantly if http://www.itk.org/Bug/view.php?id=10337 got fixed in CMake (or a custom version of GetPrerequisites.cmake and BundleUtilities.cmake got included in ParaView). Also note that this patch does not go the whole way (if I remember correctly) as the references to libQtCLucene.dylib are not updated by the bundle utilities (due to issue 10337).

Please sign in to comment.