chatterino2
Code Issues

Fix: dont run windeployqt with VCPKG (#4297)

Browse Source
This commit is contained in:
kornes
2023-01-09 18:43:36 +00:00
committed by GitHub
parent 5ad8ca791c
commit a567cc5ae7
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+2
View File
@@ -637,6 +637,7 @@ if (BUILD_APP)
) )
if (MSVC) if (MSVC)
if (NOT VCPKG_INSTALLED_DIR)
get_target_property(Qt_Core_Location Qt${MAJOR_QT_VERSION}::Core LOCATION) get_target_property(Qt_Core_Location Qt${MAJOR_QT_VERSION}::Core LOCATION)
get_filename_component(QT_BIN_DIR ${Qt_Core_Location} DIRECTORY) get_filename_component(QT_BIN_DIR ${Qt_Core_Location} DIRECTORY)
set(WINDEPLOYQT_COMMAND "${QT_BIN_DIR}/windeployqt.exe" $<TARGET_FILE:${EXECUTABLE_PROJECT}> --release --no-compiler-runtime --no-translations --no-opengl-sw) set(WINDEPLOYQT_COMMAND "${QT_BIN_DIR}/windeployqt.exe" $<TARGET_FILE:${EXECUTABLE_PROJECT}> --release --no-compiler-runtime --no-translations --no-opengl-sw)
@@ -646,6 +647,7 @@ if (BUILD_APP)
) )
install(CODE "execute_process(COMMAND ${WINDEPLOYQT_COMMAND} --dir \${CMAKE_INSTALL_PREFIX})") install(CODE "execute_process(COMMAND ${WINDEPLOYQT_COMMAND} --dir \${CMAKE_INSTALL_PREFIX})")
endif()
elseif (APPLE) elseif (APPLE)
install(TARGETS ${EXECUTABLE_PROJECT} install(TARGETS ${EXECUTABLE_PROJECT}
RUNTIME DESTINATION bin RUNTIME DESTINATION bin