Commit 53bdaec8 authored by Jan Möbius's avatar Jan Möbius
Browse files

Try to fix fixbundle

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17098 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 1e8b841d
...@@ -31,5 +31,5 @@ get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH) ...@@ -31,5 +31,5 @@ get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH)
file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/Plugins/*.dll") file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/Plugins/*.dll")
# fix all dependencies # fix all dependencies
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@") fixup_bundle ("@CMAKE_BINARY_DIR@/Build/${OPENFLIPPER_PRODUCT_STRING}.exe" "${_plugins}" "${_GlutDir};@Qwt5_Qt4_LIBRARY_DIR@;@GLEW_LIBRARY_DIR@;@QT_BINARY_DIR@;@FTGL_LIBRARY_DIRS@;@FREETYPE_LIBRARY_DIR@;@WINDOWS_COPY_LIBDIRS@")
...@@ -147,7 +147,7 @@ if (WIN32) ...@@ -147,7 +147,7 @@ if (WIN32)
# window NSIS installer # window NSIS installer
set (CPACK_GENERATOR "NSIS") set (CPACK_GENERATOR "NSIS")
set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}") set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
set (CPACK_NSIS_DISPLAY_NAME "OpenFlipper v${CPACK_PACKAGE_VERSION}") set (CPACK_NSIS_DISPLAY_NAME "${OPENFLIPPER_PRODUCT_STRING} v${CPACK_PACKAGE_VERSION}")
set (CPACK_NSIS_MUI_ICON ${WINDOWS_INSTALLER_ICON} ) set (CPACK_NSIS_MUI_ICON ${WINDOWS_INSTALLER_ICON} )
# we need a real uninstaller icon here and we have to define both to make the installer icon work # we need a real uninstaller icon here and we have to define both to make the installer icon work
...@@ -164,10 +164,10 @@ if (WIN32) ...@@ -164,10 +164,10 @@ if (WIN32)
# set (CPACK_NSIS_CONTACT "") # set (CPACK_NSIS_CONTACT "")
set (CPACK_NSIS_CREATE_ICONS set (CPACK_NSIS_CREATE_ICONS
"CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\OpenFlipper.lnk\\\" \\\"$INSTDIR\\\\OpenFlipper.exe\\\"" "CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${OPENFLIPPER_PRODUCT_STRING}.lnk\\\" \\\"$INSTDIR\\\\${OPENFLIPPER_PRODUCT_STRING}.exe\\\""
) )
set (CPACK_NSIS_DELETE_ICONS set (CPACK_NSIS_DELETE_ICONS
"Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\OpenFlipper.lnk\\\"" "Delete \\\"$SMPROGRAMS\\\\$MUI_TEMP\\\\${OPENFLIPPER_PRODUCT_STRING}.lnk\\\""
) )
file (GLOB _files "${CMAKE_BINARY_DIR}/Build/*.dll") file (GLOB _files "${CMAKE_BINARY_DIR}/Build/*.dll")
......
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