Refactor DLL installation for Windows deployment
This commit is contained in:
+4
-7
@@ -147,7 +147,6 @@ install(TARGETS GitAddonsManager
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
# Run windeployqt and capture its output into the install tree
|
|
||||||
find_program(WINDEPLOYQT windeployqt HINTS "${CMAKE_PREFIX_PATH}/bin")
|
find_program(WINDEPLOYQT windeployqt HINTS "${CMAKE_PREFIX_PATH}/bin")
|
||||||
install(CODE "
|
install(CODE "
|
||||||
execute_process(
|
execute_process(
|
||||||
@@ -156,12 +155,10 @@ if(WIN32)
|
|||||||
\"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/GitAddonsManager.exe\"
|
\"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/GitAddonsManager.exe\"
|
||||||
)
|
)
|
||||||
")
|
")
|
||||||
install(FILES
|
install(CODE "
|
||||||
C:/vcpkg/installed/x64-windows/bin/git2.dll
|
file(GLOB VCPKG_DLLS \"C:/vcpkg/installed/x64-windows/bin/*.dll\")
|
||||||
C:/vcpkg/installed/x64-windows/bin/zlib1.dll
|
file(INSTALL \${VCPKG_DLLS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}\")
|
||||||
C:/vcpkg/installed/x64-windows/bin/pcre2-8.dll
|
")
|
||||||
DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT WIN32)
|
if(NOT WIN32)
|
||||||
|
|||||||
Reference in New Issue
Block a user