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

Windows: switch to OpenSSL 3

Browse Source
This commit is contained in:
Christian Hohnstaedt 2023-05-20 18:19:36 +02:00
parent 924c56960b
commit 331d2ca58b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -63,6 +63,9 @@ elseif(WIN32)
if (NOT OPENSSL_ROOT_DIR)
set(OPENSSL_ROOT_DIR $ENV{PROGRAMFILES}/OpenSSL-Win64)
endif()
if (NOT OPENSSL_LIBRARY_MAJOR)
set(OPENSSL_LIBRARY_MAJOR 3) # For OpenSSL 1.1.1 use "1_1"
endif()
set(PSQL_BINDIR $ENV{PROGRAMFILES}/PostgreSQL/14/bin
CACHE PATH "PostgreSQL installation directory for the MSI installer")
set(MYSQL_BINDIR $ENV{PROGRAMFILES}/qsqlmysql.dll_Qt_SQL_driver_5.15.2_MinGW_8.1.0_64-bit/${CMAKE_BUILD_TYPE}
@ -237,7 +240,7 @@ elseif(WIN32)
${CMAKE_BINARY_DIR}/libstdc++-6.dll
${CMAKE_BINARY_DIR}/libwinpthread-1.dll
${SYSTEM32}/vcruntime140.dll
${OPENSSL_ROOT_DIR}/bin/libcrypto-1_1-x64.dll
${OPENSSL_ROOT_DIR}/bin/libcrypto-${OPENSSL_LIBRARY_MAJOR}-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})")

2
README.md
View File

@ -69,7 +69,7 @@ XCA can be used with Xcode after initializing the directory with:
- Install the dependencies
- Install Python for windows from the store or https://www.python.org/downloads/windows/
- Install OpenSSL from here: https://slproweb.com/download/Win64OpenSSL-1_1_1m.msi and verify the sha256 from https://github.com/slproweb/opensslhashes/blob/master/win32_openssl_hashes.json
- Install OpenSSL from here: https://slproweb.com/download/Win64OpenSSL-3_0_8.msi and verify the sha256 from https://github.com/slproweb/opensslhashes/blob/master/win32_openssl_hashes.json
- To install the Qt libraries, cmake and the MinGW compiler [aqtinstall](https://github.com/miurahr/aqtinstall) is used.
Sphinx is used to generate the documentation
```

4
misc/dynamic.wxs.in
View File

@ -4,7 +4,7 @@
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Component Id="Clibcrypto11x64" Guid="44133d17-96b5-4aee-8a24-9c722482add5">
<File Id="libcrypto11x64.dll" Source="@OPENSSL_ROOT_DIR@/bin/libcrypto-1_1-x64.dll" KeyPath="yes"/>
<File Id="libcrypto11x64.dll" Source="@OPENSSL_ROOT_DIR@/bin/libcrypto-@OPENSSL_LIBRARY_MAJOR@-x64.dll" KeyPath="yes"/>
</Component>
<Component Id="Cvcruntime140" Guid="f0b03b2a-14f7-4631-bfe3-d4c6c9b57e1d">
<File Id="vcruntime140.dll" Source="@SYSTEM32@/vcruntime140.dll" KeyPath="yes"/>
@ -78,7 +78,7 @@
<?endif ?>
<?if NOT "@PSQL_BINDIR@" = "" ?>
<Component Id="Clibssl11x64" Guid="6b19ce1c-4f7e-447f-8998-9209e642a43b">
<File Id="libssl11x64.dll" Source="@PSQL_BINDIR@/libssl-1_1-x64.dll" KeyPath="yes"/>
<File Id="libssl11x64.dll" Source="@PSQL_BINDIR@/libssl-@OPENSSL_LIBRARY_MAJOR@-x64.dll" KeyPath="yes"/>
</Component>
<Component Id="Clibpq" Guid="f243d4ea-d51d-42fc-a3c0-4eb186c55d34">
<File Id="libpq.dll" Source="@PSQL_BINDIR@/libpq.dll" KeyPath="yes"/>