diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 11:33:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-01 11:33:45 +0300 |
| commit | 4e1fa7f63da580c1e0e4256bc4af3c02cdc51939 (patch) | |
| tree | 6ac1589c98dbf15a465365f4f16a09da51ea8c48 /win/packaging | |
| parent | ff81faf670e083e1da4f3e7bce33fe9104410b2c (diff) | |
| parent | 2f3968d98f8d90a9a9747e5b89c8f07efc6732e8 (diff) | |
| download | mariadb-git-4e1fa7f63da580c1e0e4256bc4af3c02cdc51939.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'win/packaging')
| -rw-r--r-- | win/packaging/create_msi.cmake.in | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/win/packaging/create_msi.cmake.in b/win/packaging/create_msi.cmake.in index 4b05e61decd..c37f7ca9d1d 100644 --- a/win/packaging/create_msi.cmake.in +++ b/win/packaging/create_msi.cmake.in @@ -78,13 +78,6 @@ ELSE() ENDIF() SET(ENV{VS_UNICODE_OUTPUT}) -# Workaround for CMake bug#11452 -# Switch off the monolithic install -EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=0 ${CMAKE_BINARY_DIR} - OUTPUT_QUIET -) - INCLUDE(${CMAKE_BINARY_DIR}/CPackConfig.cmake) @@ -441,11 +434,4 @@ ENDIF() CONFIGURE_FILE(${CPACK_PACKAGE_FILE_NAME}.msi ${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.msi COPYONLY) - -# Workaround for CMake bug#11452 -# Switch monolithic install on again -EXECUTE_PROCESS( - COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=1 ${CMAKE_BINARY_DIR} - OUTPUT_QUIET -) |