fix bug #2770 - mingwm10.dll missing from 1.4.2 and 1.5.0 installer
This commit is contained in:
parent
ef3baf5e52
commit
2e15caa2bb
|
@ -439,7 +439,7 @@ class InternalCommands:
|
||||||
if err != 0:
|
if err != 0:
|
||||||
raise Exception('doxygen failed with error code: ' + str(err))
|
raise Exception('doxygen failed with error code: ' + str(err))
|
||||||
|
|
||||||
def dist(self, type, vcRedistDir):
|
def dist(self, type, vcRedistDir, qtDir):
|
||||||
|
|
||||||
# Package is supported by default.
|
# Package is supported by default.
|
||||||
package_unsupported = False
|
package_unsupported = False
|
||||||
|
@ -453,8 +453,8 @@ class InternalCommands:
|
||||||
raise Exception(
|
raise Exception(
|
||||||
'VC++ redist dir path not specified (--vcredist-dir).')
|
'VC++ redist dir path not specified (--vcredist-dir).')
|
||||||
|
|
||||||
# escape path separators for cmake
|
# forward slashes are easier in cmake
|
||||||
vcRedistDir = vcRedistDir.replace('\\', '\\\\')
|
vcRedistDir = vcRedistDir.replace('\\', '/')
|
||||||
|
|
||||||
vcRedistArch = 'x86'
|
vcRedistArch = 'x86'
|
||||||
if generator.endswith('Win64'):
|
if generator.endswith('Win64'):
|
||||||
|
@ -465,6 +465,10 @@ class InternalCommands:
|
||||||
confArgs += (' -DVCREDIST_DIR:STRING=' + vcRedistDir +
|
confArgs += (' -DVCREDIST_DIR:STRING=' + vcRedistDir +
|
||||||
' -DVCREDIST_FILE:STRING=' + vcRedistFile)
|
' -DVCREDIST_FILE:STRING=' + vcRedistFile)
|
||||||
|
|
||||||
|
if (qtDir != ''):
|
||||||
|
# forward slashes are easier in cmake
|
||||||
|
confArgs += ' -DQT_DIR:STRING=' + qtDir.replace('\\', '/')
|
||||||
|
|
||||||
self.configure_internal('', confArgs)
|
self.configure_internal('', confArgs)
|
||||||
else:
|
else:
|
||||||
self.configure_internal(unixTarget, confArgs)
|
self.configure_internal(unixTarget, confArgs)
|
||||||
|
@ -878,6 +882,7 @@ class CommandHandler:
|
||||||
ic = InternalCommands()
|
ic = InternalCommands()
|
||||||
build_targets = []
|
build_targets = []
|
||||||
vcRedistDir = ''
|
vcRedistDir = ''
|
||||||
|
qtDir = ''
|
||||||
|
|
||||||
def __init__(self, argv, opts, args, verbose):
|
def __init__(self, argv, opts, args, verbose):
|
||||||
|
|
||||||
|
@ -899,6 +904,8 @@ class CommandHandler:
|
||||||
self.build_targets += ['release',]
|
self.build_targets += ['release',]
|
||||||
elif o == '--vcredist-dir':
|
elif o == '--vcredist-dir':
|
||||||
self.vcRedistDir = a
|
self.vcRedistDir = a
|
||||||
|
elif o == '--qt-dir':
|
||||||
|
self.qtDir = a
|
||||||
|
|
||||||
def about(self):
|
def about(self):
|
||||||
self.ic.about()
|
self.ic.about()
|
||||||
|
@ -933,7 +940,7 @@ class CommandHandler:
|
||||||
if len(self.args) > 0:
|
if len(self.args) > 0:
|
||||||
type = self.args[0]
|
type = self.args[0]
|
||||||
|
|
||||||
self.ic.dist(type, self.vcRedistDir)
|
self.ic.dist(type, self.vcRedistDir, self.qtDir)
|
||||||
|
|
||||||
def distftp(self):
|
def distftp(self):
|
||||||
type = None
|
type = None
|
||||||
|
|
|
@ -32,12 +32,17 @@ IF(WIN32)
|
||||||
INSTALL(
|
INSTALL(
|
||||||
FILES
|
FILES
|
||||||
bin/Release/qsynergy.exe
|
bin/Release/qsynergy.exe
|
||||||
|
${QT_DIR}/qt/bin/libgcc_s_dw2-1.dll
|
||||||
|
${QT_DIR}/qt/bin/mingwm10.dll
|
||||||
|
${QT_DIR}/qt/bin/QtGui4.dll
|
||||||
|
${QT_DIR}/qt/bin/QtCore4.dll
|
||||||
|
${QT_DIR}/qt/bin/QtNetwork4.dll
|
||||||
COMPONENT qsynergy
|
COMPONENT qsynergy
|
||||||
DESTINATION bin)
|
DESTINATION bin)
|
||||||
|
|
||||||
set(CPACK_COMPONENT_QSYNERGY_DISPLAY_NAME "Graphical User Interface")
|
set(CPACK_COMPONENT_QSYNERGY_DISPLAY_NAME "Graphical User Interface")
|
||||||
|
|
||||||
set(VCREDIST_PATH "${VCREDIST_DIR}\\\\${VCREDIST_FILE}")
|
set(VCREDIST_PATH "${VCREDIST_DIR}/${VCREDIST_FILE}")
|
||||||
|
|
||||||
install(
|
install(
|
||||||
PROGRAMS
|
PROGRAMS
|
||||||
|
|
2
hm.py
2
hm.py
|
@ -52,7 +52,7 @@ cmd_opt_dict = {
|
||||||
'update' : ['', []],
|
'update' : ['', []],
|
||||||
'install' : ['', []],
|
'install' : ['', []],
|
||||||
'doxygen' : ['', []],
|
'doxygen' : ['', []],
|
||||||
'dist' : ['', ['vcredist-dir=',]],
|
'dist' : ['', ['vcredist-dir=', 'qt-dir=']],
|
||||||
'distftp' : ['', ['host=', 'user=', 'pass=', 'dir=']],
|
'distftp' : ['', ['host=', 'user=', 'pass=', 'dir=']],
|
||||||
'kill' : ['', []],
|
'kill' : ['', []],
|
||||||
'usage' : ['', []],
|
'usage' : ['', []],
|
||||||
|
|
Loading…
Reference in New Issue