mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
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.
This commit is contained in:
parent
b8b3ba632b
commit
db51ad1e01
1 changed files with 0 additions and 14 deletions
|
@ -78,13 +78,6 @@ ELSE()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
SET(ENV{VS_UNICODE_OUTPUT})
|
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)
|
INCLUDE(${CMAKE_BINARY_DIR}/CPackConfig.cmake)
|
||||||
|
|
||||||
|
@ -442,10 +435,3 @@ CONFIGURE_FILE(${CPACK_PACKAGE_FILE_NAME}.msi
|
||||||
${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.msi
|
${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.msi
|
||||||
COPYONLY)
|
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
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue