diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-29 10:07:33 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-29 10:07:33 +0300 |
| commit | f192b48d620d0e412a8324dda65a143c2852619e (patch) | |
| tree | 2744c49103142a1db66e2836055c0ec21dffc7cc /win | |
| parent | 71931fdf837b88e003998d12442a41c4f2c08c4a (diff) | |
| parent | 11352d52cd35f89b1d573405fca92932e112cba9 (diff) | |
| download | mariadb-git-f192b48d620d0e412a8324dda65a143c2852619e.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'win')
| -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 -) |