Commit d2fac470 authored by Jan Möbius's avatar Jan Möbius

In fixbundle, handle plugins too

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@10708 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 150a9923
...@@ -13,10 +13,10 @@ function(gp_item_default_embedded_path_override item default_embedded_path_var) ...@@ -13,10 +13,10 @@ function(gp_item_default_embedded_path_override item default_embedded_path_var)
set(path "${${default_embedded_path_var}}") set(path "${${default_embedded_path_var}}")
# ...embed *.dll in the Plugins folder: # ...embed *.dll in the Plugins folder:
# # Or better: leave them where they are
#if(item MATCHES "\\.Plugin-*.dll$") if(item MATCHES ".*Plugin-.*.dll")
# set(path "@CMAKE_BINARY_DIR@/Build/Plugins") set(path "@CMAKE_BINARY_DIR@/Build/Plugins")
#endif() endif()
set(${default_embedded_path_var} "${path}" PARENT_SCOPE) set(${default_embedded_path_var} "${path}" PARENT_SCOPE)
endfunction(gp_item_default_embedded_path_override) endfunction(gp_item_default_embedded_path_override)
...@@ -30,11 +30,6 @@ get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH) ...@@ -30,11 +30,6 @@ get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH)
# Find all plugins # Find all plugins
file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/Plugins/*.dll") file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/Plugins/*.dll")
#todo: fixup plugins:
#${_plugins}
# fix all dependencies # fix all dependencies
fixup_bundle ("@CMAKE_BINARY_DIR@/Build/OpenFlipper.exe" "" "${_GlutDir};@Qwt5_Qt4_LIBRARY_DIR@;@GLEW_LIBRARY_DIR@;@QT_BINARY_DIR@") fixup_bundle ("@CMAKE_BINARY_DIR@/Build/OpenFlipper.exe" "${_plugins}" "${_GlutDir};@Qwt5_Qt4_LIBRARY_DIR@;@GLEW_LIBRARY_DIR@;@QT_BINARY_DIR@;@FTGL_LIBRARY_DIRS@;@FREETYPE_LIBRARY_DIR@;@WINDOWS_COPY_LIBDIRS@")
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