diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-08-13 12:22:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-08-13 13:30:32 +0200 |
| commit | fac3e575b203e8d6a522a475f9aab4ec5041b146 (patch) | |
| tree | c1fb08ac820b1f59bd00378c0022feb6fb880add /win/packaging | |
| parent | a928751c78a8288e4490b27ef8ae6a39b9708f39 (diff) | |
| download | mariadb-git-fac3e575b203e8d6a522a475f9aab4ec5041b146.tar.gz | |
fix third-party tool packaging on Win
Diffstat (limited to 'win/packaging')
| -rw-r--r-- | win/packaging/create_msi.cmake | 1 | ||||
| -rw-r--r-- | win/packaging/heidisql.cmake | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/win/packaging/create_msi.cmake b/win/packaging/create_msi.cmake index f0407684ff3..795baa32c8f 100644 --- a/win/packaging/create_msi.cmake +++ b/win/packaging/create_msi.cmake @@ -389,6 +389,7 @@ EXECUTE_PROCESS( ) IF(SIGNCODE) + SEPARATE_ARGUMENTS(SIGNTOOL_PARAMETERS WINDOWS_COMMAND "${SIGNTOOL_PARAMETERS}") EXECUTE_PROCESS( COMMAND ${SIGNTOOL_EXECUTABLE} sign ${SIGNTOOL_PARAMETERS} /d ${CPACK_PACKAGE_FILE_NAME}.msi diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake index 77a0bc05e70..6f325ca30af 100644 --- a/win/packaging/heidisql.cmake +++ b/win/packaging/heidisql.cmake @@ -13,5 +13,5 @@ IF(NOT EXISTS ${HEIDISQL_DOWNLOAD_DIR}/${HEIDISQL_ZIP}) ENDIF() SET(LIBMYSQLDLL_SOURCE ${HEIDISQL_DOWNLOAD_DIR}/libmysql.dll) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql.wxi) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/heidisql_feature.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql_feature.wxi) +CONFIGURE_FILE(${SRCDIR}/heidisql.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql.wxi) +CONFIGURE_FILE(${SRCDIR}/heidisql_feature.wxi.in ${CMAKE_CURRENT_BINARY_DIR}/heidisql_feature.wxi) |