The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix runtime error because of wrong DLL

Browse Source
This commit is contained in:
Christian Hohnstaedt 2022-08-12 00:42:24 +02:00 committed by Christian Hohnstaedt
parent 4bf49de81f
commit 5441d91b18
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -212,7 +212,7 @@ elseif(WIN32)
${CMAKE_BINARY_DIR}/misc/misc.wxs
${CMAKE_BINARY_DIR}/misc/dynamic.wxs
)
string(APPEND CMAKE_CXX_FLAGS "-mwindows")
target_link_options(${CMAKE_PROJECT_NAME} PRIVATE -mwindows -MT$<$<CONFIG:Debug>:D>)
install(DIRECTORY
${CMAKE_BINARY_DIR}/platforms
${CMAKE_BINARY_DIR}/sqldrivers
@ -231,7 +231,7 @@ elseif(WIN32)
${OPENSSL_ROOT_DIR}/bin/libcrypto-1_1-x64.dll
DESTINATION ${RUNTIME_DEST}
)
install(CODE "execute_process(COMMAND cmake -E chdir ${CMAKE_INSTALL_PREFIX} tar cvf ${RUNTIME_DEST}.zip --format=zip -- ${RUNTIME_DEST})")
install(CODE "execute_process(COMMAND cmake -E chdir \${CMAKE_INSTALL_PREFIX} tar cvf ${RUNTIME_DEST}.zip --format=zip -- ${RUNTIME_DEST})")
set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
else()

5
misc/dynamic.wxs.in
View File

@ -9,7 +9,10 @@
<Component Id="Cvcruntime140" Guid="f0b03b2a-14f7-4631-bfe3-d4c6c9b57e1d">
<File Id="vcruntime140.dll" Source="@SYSTEM32@/vcruntime140.dll" KeyPath="yes"/>
</Component>
<!-- aqt install-tool windows desktop tools_vcredist qt.tools.vcredist_msvc2019_x64 -->
<!-- aqt install-tool windows desktop tools_vcredist qt.tools.vcredist_msvc2019_x64
Copy C:\Windows\System32\vcruntime140.dll C:\Windows\WOW64\
The WIX system uses that one and it crashes on the target.
-->
</DirectoryRef>
<FeatureGroup Id="DatabaseGroup">
<Feature Id="Databases" Title="Database Drivers"