diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-28 15:05:46 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-28 15:05:46 +0300 |
| commit | 11352d52cd35f89b1d573405fca92932e112cba9 (patch) | |
| tree | 77e2880d62fca5c7aa93d4a6bcfa299606e7f831 /win | |
| parent | 61096ff214dec68a66efb811aa3a70ef49f06a11 (diff) | |
| parent | 582545a38421ea0e43f326db84550773411c3261 (diff) | |
| download | mariadb-git-11352d52cd35f89b1d573405fca92932e112cba9.tar.gz | |
Merge 10.0 into 10.1
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 1f847a39695..62ce5f1edd2 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 -) |