birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert OpenSSL to the new 3p package system (#213)

Browse Source
This commit is contained in:
Chris Burel
2021-04-26 08:35:40 -07:00
committed by GitHub
parent fbfc2e4968
commit e468a93a13
15 changed files with 7 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/3rdParty/FindOpenSSL.cmake
Vendored
-17
View File
@@ -1,17 +0,0 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#
ly_add_external_target(
NAME OpenSSL
VERSION 1.1.1b-noasm-az
INCLUDE_DIRECTORIES include
COMPILE_DEFINITIONS OPENSSL_ENABLED
)
cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake
Vendored
+1
View File
@@ -30,3 +30,4 @@ ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-android TARGETS mik
ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-android TARGETS googletest PACKAGE_HASH 95671be75287a61c9533452835c3647e9c1b30f81b34b43bcb0ec1997cc23894)
ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-android TARGETS GoogleBenchmark PACKAGE_HASH 20b46e572211a69d7d94ddad1c89ec37bb958711d6ad4025368ac89ea83078fb)
ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-android TARGETS libsamplerate PACKAGE_HASH bf13662afe65d02bcfa16258a4caa9b875534978227d6f9f36c9cfa92b3fb12b)
ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev1-android TARGETS OpenSSL PACKAGE_HASH 4036d4019d722f0e1b7a1621bf60b5a17ca6a65c9c78fd8701cee1131eec8480)
cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
Vendored
+1
View File
@@ -45,3 +45,4 @@ ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-linux TARGETS Goog
ly_associate_package(PACKAGE_NAME unwind-1.2.1-linux TARGETS unwind PACKAGE_HASH 3453265fb056e25432f611a61546a25f60388e315515ad39007b5925dd054a77)
ly_associate_package(PACKAGE_NAME qt-5.15.2-linux TARGETS Qt PACKAGE_HASH 3857fbb2fc5581cdb71d80a7f9298c83ef06073d4e1ccd86a32b4f88782b6f14)
ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-linux TARGETS libsamplerate PACKAGE_HASH 41643c31bc6b7d037f895f89d8d8d6369e906b92eff42b0fe05ee6a100f06261)
ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev2-linux TARGETS OpenSSL PACKAGE_HASH b779426d1e9c5ddf71160d5ae2e639c3b956e0fb5e9fcaf9ce97c4526024e3bc)
cmake/3rdParty/Platform/Linux/OpenSSL_linux.cmake
Vendored
-22
View File
@@ -1,22 +0,0 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#
set(OPENSSL_LIBS
${BASE_PATH}/bin/linux-x86_64-clang-$<IF:$<CONFIG:Debug>,debug,release>/libcrypto.so
${BASE_PATH}/bin/linux-x86_64-clang-$<IF:$<CONFIG:Debug>,debug,release>/libssl.so
)
set(OPENSSL_RUNTIME_DEPENDENCIES
${BASE_PATH}/bin/linux-x86_64-clang-$<IF:$<CONFIG:Debug>,debug,release>/libcrypto.so
${BASE_PATH}/bin/linux-x86_64-clang-$<IF:$<CONFIG:Debug>,debug,release>/libssl.so
${BASE_PATH}/bin/linux-x86_64-clang-$<IF:$<CONFIG:Debug>,debug,release>/libcrypto.so.1.1
${BASE_PATH}/bin/linux-x86_64-clang-$<IF:$<CONFIG:Debug>,debug,release>/libssl.so.1.1
)
cmake/3rdParty/Platform/Linux/cmake_linux_files.cmake
Vendored
-1
View File
@@ -13,6 +13,5 @@ set(FILES
BuiltInPackages_linux.cmake
dyad_linux.cmake
FbxSdk_linux.cmake
OpenSSL_linux.cmake
Wwise_linux.cmake
)
cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
Vendored
+1
View File
@@ -46,5 +46,6 @@ ly_associate_package(PACKAGE_NAME etc2comp-9cd0f9cae0-rev1-mac TARGETS etc
ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-mac TARGETS mikkelsen PACKAGE_HASH 83af99ca8bee123684ad254263add556f0cf49486c0b3e32e6d303535714e505)
ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-mac TARGETS googletest PACKAGE_HASH cbf020d5ef976c5db8b6e894c6c63151ade85ed98e7c502729dd20172acae5a8)
ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-mac TARGETS GoogleBenchmark PACKAGE_HASH ad25de0146769c91e179953d845de2bec8ed4a691f973f47e3eb37639381f665)
ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev1-mac TARGETS OpenSSL PACKAGE_HASH 28adc1c0616ac0482b2a9d7b4a3a3635a1020e87b163f8aba687c501cf35f96c)
ly_associate_package(PACKAGE_NAME qt-5.15.2-mac TARGETS Qt PACKAGE_HASH ac248833d65838e4bcef50f30c9ff02ba9464ff64b9ada52de2ad6045d38baec)
ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-mac TARGETS libsamplerate PACKAGE_HASH b912af40c0ac197af9c43d85004395ba92a6a859a24b7eacd920fed5854a97fe)
cmake/3rdParty/Platform/Mac/OpenSSL_mac.cmake
Vendored
-15
View File
@@ -1,15 +0,0 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#
set(OPENSSL_LIBS
${BASE_PATH}/lib/darwin-x86_64-$<IF:$<CONFIG:Debug>,debug,release>/libcrypto.a
${BASE_PATH}/lib/darwin-x86_64-$<IF:$<CONFIG:Debug>,debug,release>/libssl.a
)
cmake/3rdParty/Platform/Mac/cmake_mac_files.cmake
Vendored
-1
View File
@@ -13,6 +13,5 @@ set(FILES
BuiltInPackages_mac.cmake
FbxSdk_mac.cmake
OpenGLInterface_mac.cmake
OpenSSL_mac.cmake
Wwise_mac.cmake
)
cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
Vendored
+2 -1
View File
@@ -54,4 +54,5 @@ ly_associate_package(PACKAGE_NAME openimageio-2.1.16.0-rev2-windows TARGETS Ope
ly_associate_package(PACKAGE_NAME qt-5.15.2-windows TARGETS Qt PACKAGE_HASH edaf954c647c99727bfd313dab2959803d2df0873914bb96368c3d8286eed6d9)
ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-windows TARGETS libsamplerate PACKAGE_HASH dcf3c11a96f212a52e2c9241abde5c364ee90b0f32fe6eeb6dcdca01d491829f)
ly_associate_package(PACKAGE_NAME OpenMesh-8.1-rev1-windows TARGETS OpenMesh PACKAGE_HASH 1c1df639358526c368e790dfce40c45cbdfcfb1c9a041b9d7054a8949d88ee77)
ly_associate_package(PACKAGE_NAME civetweb-1.8-rev1-windows TARGETS civetweb PACKAGE_HASH 36d0e58a59bcdb4dd70493fb1b177aa0354c945b06c30416348fd326cf323dd4)
ly_associate_package(PACKAGE_NAME civetweb-1.8-rev1-windows TARGETS civetweb PACKAGE_HASH 36d0e58a59bcdb4dd70493fb1b177aa0354c945b06c30416348fd326cf323dd4)
ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev2-windows TARGETS OpenSSL PACKAGE_HASH 9af1c50343f89146b4053101a7aeb20513319a3fe2f007e356d7ce25f9241040)
cmake/3rdParty/Platform/Windows/OpenSSL_windows.cmake
Vendored
-18
View File
@@ -1,18 +0,0 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#
set(OPENSSL_LIBS
${BASE_PATH}/lib/vc140_x64_$<IF:$<CONFIG:Debug>,debug,release>/libcrypto.lib
${BASE_PATH}/lib/vc140_x64_$<IF:$<CONFIG:Debug>,debug,release>/libssl.lib
crypt32.lib
)
set(ENV{OPENSSL_HOME} ${BASE_PATH})
cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
Vendored
-1
View File
@@ -15,6 +15,5 @@ set(FILES
dyad_windows.cmake
FbxSdk_windows.cmake
libav_windows.cmake
OpenSSL_windows.cmake
Wwise_windows.cmake
)
cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake
Vendored
+1
View File
@@ -31,3 +31,4 @@ ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-ios TARGETS mikkels
ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-ios TARGETS googletest PACKAGE_HASH 2f121ad9784c0ab73dfaa58e1fee05440a82a07cc556bec162eeb407688111a7)
ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-ios TARGETS GoogleBenchmark PACKAGE_HASH c2ffaed2b658892b1bcf81dee4b44cd1cb09fc78d55584ef5cb8ab87f2d8d1ae)
ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-ios TARGETS libsamplerate PACKAGE_HASH 7656b961697f490d4f9c35d2e61559f6fc38c32102e542a33c212cd618fc2119)
ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev1-ios TARGETS OpenSSL PACKAGE_HASH cd0dfce3086a7172777c63dadbaf0ac3695b676119ecb6d0614b5fb1da03462f)
cmake/3rdParty/Platform/iOS/OpenSSL_ios.cmake
Vendored
-15
View File
@@ -1,15 +0,0 @@
#
# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
# its licensors.
#
# For complete copyright and license terms please see the LICENSE at the root of this
# distribution (the "License"). All use of this software is governed by the License,
# or, if provided, by the license below or the license accompanying this file. Do not
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
#
set(OPENSSL_LIBS
${BASE_PATH}/lib/ios_arm64_$<IF:$<CONFIG:Debug>,debug,release>/libcrypto.a
${BASE_PATH}/lib/ios_arm64_$<IF:$<CONFIG:Debug>,debug,release>/libssl.a
)
cmake/3rdParty/Platform/iOS/cmake_ios_files.cmake
Vendored
+1 -2
View File
@@ -11,7 +11,6 @@
set(FILES
BuiltInPackages_ios.cmake
OpenSSL_ios.cmake
RadTelemetry_ios.cmake
Wwise_ios.cmake
)
)
cmake/3rdParty/cmake_files.cmake
Vendored
-1
View File
@@ -16,7 +16,6 @@ set(FILES
FindFbxSdk.cmake
Findlibav.cmake
FindOpenGLInterface.cmake
FindOpenSSL.cmake
FindRadTelemetry.cmake
FindVkValidation.cmake
FindWwise.cmake