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

[SPEC-6071][Crashpad] Make Crashpad available through 3rdParty system for Windows

Browse Source
This commit is contained in:
junbo
2021-04-19 22:38:33 -07:00
parent 17997b3df8
commit eb0758f63a
14 changed files with 16 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/3rdParty/FindCrashpad.cmake
Vendored
-30
View File
@@ -1,30 +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 Crashpad
VERSION ""
3RDPARTY_ROOT_DIRECTORY ${LY_ROOT_FOLDER}/Tools/Crashpad
INCLUDE_DIRECTORIES
include
include/third_party/mini_chromium/mini_chromium/
)
ly_add_external_target(
NAME Handler
PACKAGE Crashpad
VERSION ""
3RDPARTY_ROOT_DIRECTORY ${LY_ROOT_FOLDER}/Tools/Crashpad
INCLUDE_DIRECTORIES
include
include/third_party/mini_chromium/mini_chromium
include/third_party/getopt
)
cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
Vendored
+1
View File
@@ -56,3 +56,4 @@ ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-windows TARGETS lib
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 OpenSSL-1.1.1b-rev2-windows TARGETS OpenSSL PACKAGE_HASH 9af1c50343f89146b4053101a7aeb20513319a3fe2f007e356d7ce25f9241040)
ly_associate_package(PACKAGE_NAME Crashpad-0.8.0-windows TARGETS Crashpad PACKAGE_HASH 6a6ae2d1c5bbc2083823c2a8a0a7c01b88ee47261c64e529e14c1f83f3436de2)
cmake/3rdParty/Platform/Windows/Crashpad_windows.cmake
Vendored
-36
View File
@@ -1,36 +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(libpath ${BASE_PATH}/bin/windows/vs2019/$<IF:$<CONFIG:debug>,Debug,Release>_x64)
set(CRASHPAD_LIBS
${libpath}/base.lib
${libpath}/crashpad_client.lib
${libpath}/crashpad_context.lib
${libpath}/crashpad_util.lib
winhttp
version
powrprof
)
set(CRASHPAD_INCLUDE_DIRECTORIES
include/compat/win
)
set(CRASHPAD_HANDLER_LIBS
${libpath}/crashpad_tool_support.lib
${libpath}/crashpad_compat.lib
${libpath}/third_party/getopt.lib
${libpath}/crashpad_minidump.lib
${libpath}/crashpad_snapshot.lib
${libpath}/crashpad_handler.lib
${libpath}/third_party/zlib.lib
)
cmake/3rdParty/Platform/Windows/cmake_windows_files.cmake
Vendored
-1
View File
@@ -11,7 +11,6 @@
set(FILES
BuiltInPackages_windows.cmake
Crashpad_windows.cmake
dyad_windows.cmake
FbxSdk_windows.cmake
libav_windows.cmake