diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-08-23 18:11:24 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-08-23 18:11:24 +0000 |
| commit | db51ad1e014c3a67b35adcbb90ec6a38d32a6571 (patch) | |
| tree | abb632ef5a90a2fa99f4d86f70f99495af1654f4 | |
| parent | b8b3ba632b8596bb483420dc6da46925f1c9b094 (diff) | |
| download | mariadb-git-db51ad1e014c3a67b35adcbb90ec6a38d32a6571.tar.gz | |
Remove workaround for ancient and already fixed CMake bug in MSI creation.
The workaround, an extra cmake calls, somehow makes the
connect/cmake_install.cmake to lose installation of connect-engine's
specific jar files.
| -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 -) |