Skip to content

Commit 60013e2

Browse files
agarnyagarny
authored
Upgraded some third-party libraries.
2 parents e798732 + 16bb291 commit 60013e2

File tree

4 files changed

+36
-38
lines changed

4 files changed

+36
-38
lines changed

‎src/3rdparty/OpenSSL/CMakeLists.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
# limitations under the License.
1414

1515
set(PACKAGE_NAME OpenSSL)
16-
set(PACKAGE_VERSION 3.0.14)
16+
set(PACKAGE_VERSION 3.5.0)
1717
set(PACKAGE_REPOSITORY openssl)
18-
set(RELEASE_TAG openssl-3.0.14)
18+
set(RELEASE_TAG openssl-3.5.0)
1919
set(INSTALL_DIR ${PREBUILT_DIR}/${PACKAGE_NAME})
2020

2121
# Either retrieve or build our package.
@@ -26,42 +26,42 @@ if(LIBOPENCOR_PREBUILT_OPENSSL)
2626
if(INTEL_MODE)
2727
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
2828
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
29-
c46f9ca66d99d452698f9309927d63219972a089)
29+
14cfbd7462e67547681ae2aa541c43942b550f40)
3030
else()
3131
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
3232
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
33-
b8b2de7684995a8c02c272e06031b70513793d6b)
33+
58a58fbb31ea4c3df0988081e04142d2b7e94116)
3434
endif()
3535
else()
3636
if(INTEL_MODE)
3737
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
3838
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
39-
b51022bad09ebc69618eb03f5c80a590564eb2c5)
39+
3dc66349cd5e9d0e98a375b646644196c646effb)
4040
else()
4141
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
4242
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
43-
369d4639814f3e76357e190e55dc0cb106dc535f)
43+
4fe185f053abc7aa4eceb9fe5bde1c292aee7f4c)
4444
endif()
4545
endif()
4646
elseif(APPLE)
4747
if(INTEL_MODE)
4848
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
4949
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
50-
61e6dfe3d85f4ce899e07d7c8f998221190f4fb9)
50+
dc50c2a300b6b72d63559af6994f46d7897cb8ad)
5151
else()
5252
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
5353
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
54-
71f49e49ce8e2612ca0ee1792be3863807f47e86)
54+
57506aeacc82ef50f2acf4723da1fecc3e6e9b3f)
5555
endif()
5656
else()
5757
if(INTEL_MODE)
5858
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
5959
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
60-
d5eaa89b18a7e7adce8b641488a6958827fba261)
60+
8b85efd5977077fafa194ae29fd6d9c6ca15c9b5)
6161
else()
6262
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
6363
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
64-
af12c894dc1767cae060d925893e777ecf1e439a)
64+
b4b0b49976ca19f04310fbdee5474daf928833a1)
6565
endif()
6666
endif()
6767
else()

‎src/3rdparty/libcurl/CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,42 +30,42 @@ if(LIBOPENCOR_PREBUILT_LIBCURL)
3030
if(INTEL_MODE)
3131
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
3232
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
33-
94a5ec2c7408394912d22ed3158e8028a0e7c6fa)
33+
1a4dac12be56cc76bf6a8cca5164aae84b321b49)
3434
else()
3535
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
3636
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
37-
846ae150be48bec7cb7eae9bfd85d8f5474da679)
37+
94794fa0d700f2a6956cc5fd8c078f1fbbd4383e)
3838
endif()
3939
else()
4040
if(INTEL_MODE)
4141
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
4242
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
43-
32959013dcce559b7bde7bb218f0edff4c988d83)
43+
17c73519bb0d26e044c24f23564f9fbe9e2103f0)
4444
else()
4545
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
4646
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
47-
57894bc86b6de2767e0e609299d089d5e73d336b)
47+
4019e7cb2ffd8b48b8bf64aa01af5089918bae32)
4848
endif()
4949
endif()
5050
elseif(APPLE)
5151
if(INTEL_MODE)
5252
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
5353
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
54-
abd029ace29920a7153c32bea37fafdf2a142372)
54+
7b919a6395c708515d13529f3b3fc1727aea5811)
5555
else()
5656
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
5757
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
58-
67ce6e973303e6abba2f8cb843901df6cec02947)
58+
2b397985f476be4095515a0b7ce20549342f2c47)
5959
endif()
6060
else()
6161
if(INTEL_MODE)
6262
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
6363
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
64-
e703b4df8434b8ba3eba9a645389baadb3002d99)
64+
63e3713ca2b882bf8acbd5eea4baafac965e2d7f)
6565
else()
6666
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
6767
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
68-
53a694774281231039b9e7d8b5141b69410155bc)
68+
c9d42bb0debb3ba4fbf6674b2c63bffd48cc088d)
6969
endif()
7070
endif()
7171
else()

‎src/3rdparty/libssh2/CMakeLists.txt‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
# limitations under the License.
1414

1515
set(PACKAGE_NAME libssh2)
16-
set(PACKAGE_VERSION 1.11.0)
16+
set(PACKAGE_VERSION 1.11.1)
1717
set(PACKAGE_REPOSITORY libssh2)
18-
set(RELEASE_TAG libssh2-1.11.0)
18+
set(RELEASE_TAG libssh2-1.11.1)
1919
set(INSTALL_DIR ${PREBUILT_DIR}/${PACKAGE_NAME})
2020

2121
# Either retrieve or build our package.
@@ -26,42 +26,42 @@ if(LIBOPENCOR_PREBUILT_LIBSSH2)
2626
if(INTEL_MODE)
2727
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
2828
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
29-
6d2bea2af8f41d79853b8b1f6776365c999a5911)
29+
9bb69654acf8286c5d8e80eee96f40044ecd4860)
3030
else()
3131
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
3232
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
33-
661f1e4fc15f67b2c6341eb655bfa586bea8375c)
33+
2a4e86ed8c92a023e10f0cd28cac20e8ef7b6d1e)
3434
endif()
3535
else()
3636
if(INTEL_MODE)
3737
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
3838
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
39-
31d672e4df88d94c4beab6cea0edc8b35c73b13a)
39+
3efd49014c608fae827d06673be174e7da3c6c8b)
4040
else()
4141
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
4242
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
43-
9541855997a724e90e26976454b1db09ab03fd2e)
43+
899a94cad3ec971efbbe32a58f464536a0a7bc6d)
4444
endif()
4545
endif()
4646
elseif(APPLE)
4747
if(INTEL_MODE)
4848
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
4949
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
50-
48f7ce906760b7b84e8687aae93f8cd38522737d)
50+
a2c883d325d1ce08ad12423b05c09ab80b451199)
5151
else()
5252
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
5353
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
54-
c405224fe0f754765286ceeabb2e237bcee010e3)
54+
2c4644536088adfda21792108ec5803f6e9354c6)
5555
endif()
5656
else()
5757
if(INTEL_MODE)
5858
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
5959
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
60-
8639b3d3df7ce83f2104a599a1507e28288cabc5)
60+
836b8519a2b3d19e1f1e3ae7f8611c6d3aa2ec5a)
6161
else()
6262
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
6363
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
64-
22e787ca84fc018c9dc3582e15c0d14d924684e8)
64+
8560535078d3458f7eab5398b565f286e4610d43)
6565
endif()
6666
endif()
6767
else()
@@ -85,17 +85,14 @@ else()
8585

8686
# Patch some of our CMake configuration files.
8787

88-
if(RELEASE_MODE)
89-
set(PACKAGE_MODE release)
90-
else()
91-
set(PACKAGE_MODE debug)
92-
endif()
93-
94-
set(CONFIG_FILE ${INSTALL_DIR}/lib/cmake/${PACKAGE}/Libssh2Config.cmake)
88+
set(CONFIG_FILE ${INSTALL_DIR}/lib/cmake/${PACKAGE}/libssh2-targets.cmake)
9589

9690
file(READ ${CONFIG_FILE} FILE_CONTENTS)
9791

98-
string(REGEX REPLACE "INTERFACE_LINK_LIBRARIES \"[^\"]*\"" "INTERFACE_LINK_LIBRARIES \"OpenSSL::libssl;OpenSSL::libcrypto\"" FILE_CONTENTS "${FILE_CONTENTS}")
92+
if(APPLE)
93+
string(REGEX REPLACE "/Applications/Xcode.*\.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/lib" "$<LINK_ONLY:" FILE_CONTENTS "${FILE_CONTENTS}")
94+
string(REPLACE ".tbd" ">" FILE_CONTENTS "${FILE_CONTENTS}")
95+
endif()
9996

10097
file(WRITE ${CONFIG_FILE} "${FILE_CONTENTS}")
10198

@@ -113,7 +110,7 @@ endif()
113110

114111
set(LIBSSH2_ROOT ${INSTALL_DIR} CACHE INTERNAL "${PACKAGE_NAME}'s root directory.")
115112
set(LIBSSH2_CMAKE_DIR ${INSTALL_DIR}/lib/cmake/libssh2 CACHE INTERNAL "${PACKAGE_NAME}'s CMake directory.")
116-
set(LIBSSH2_CMAKE_PACKAGE_NAME Libssh2 CACHE INTERNAL "${PACKAGE_NAME}'s CMake package name.")
113+
set(LIBSSH2_CMAKE_PACKAGE_NAME libssh2 CACHE INTERNAL "${PACKAGE_NAME}'s CMake package name.")
117114
set(LIBSSH2_INCLUDE_DIR ${INSTALL_DIR}/include CACHE INTERNAL "${PACKAGE_NAME}'s include directory.")
118-
set(LIBSSH2_LIBRARY Libssh2::libssh2_static CACHE INTERNAL "${PACKAGE_NAME}'s library.")
115+
set(LIBSSH2_LIBRARY libssh2::libssh2_static CACHE INTERNAL "${PACKAGE_NAME}'s library.")
119116
set(LIBSSH2_LIBRARY_FILE ${INSTALL_DIR}/lib/${PACKAGE_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX} CACHE INTERNAL "${PACKAGE_NAME}'s library.")

‎tests/utils.h.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ limitations under the License.
3434
// WITH A REMOTE FILE WHEN RUNNING ON Windows on ARM.
3535
# define GHA_NOT_WINDOWS_ON_ARM
3636
#endif
37+
3738
namespace libOpenCOR {
3839

3940
static constexpr auto RESOURCE_LOCATION = "@RESOURCE_LOCATION@";

0 commit comments

Comments
 (0)