Skip to content

Commit

Permalink
Remove workaround for ancient and already fixed CMake bug in MSI crea…
Browse files Browse the repository at this point in the history
…tion.

The workaround, an extra cmake calls, somehow makes the
connect/cmake_install.cmake to lose installation of connect-engine's
specific jar files.
  • Loading branch information
vaintroub committed Aug 23, 2017
1 parent b8b3ba6 commit db51ad1
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions win/packaging/create_msi.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
)

0 comments on commit db51ad1

Please sign in to comment.