mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 00:18:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg baseline][openmvs & crashpad] Add OUTPUT_NAME property to common.lib to avoid conflicts (#40729)

Browse Source 
Co-authored-by: Monica <v-liumonica@microsoft.com>
This commit is contained in:
MonicaLiu 2024-09-08 11:54:39 -07:00 committed by GitHub
parent 4ed66755ac
commit 0d6d2a2f2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 89 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/crashpad/crashpadConfig.cmake.in
View File

@ -13,7 +13,7 @@ if(NOT TARGET crashpad::crashpad)
add_library(crashpad::crashpad INTERFACE IMPORTED)
target_include_directories(crashpad::crashpad INTERFACE "${_IMPORT_PREFIX}/include/crashpad")
set(_libs client common util base)
set(_libs crashpad_client crashpad_client_common crashpad_util crashpad_base)
if(APPLE)
list(APPEND _libs mig_output)
endif()

12
ports/crashpad/fix-lib-name-conflict-1.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 0bcf519..c637f2b 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -5,6 +5,7 @@
import("../build/platform.gni")
static_library("base") {
+ output_name = "crashpad_base"
sources = [
"atomicops.h",
"atomicops_internals_atomicword_compat.h",

44
ports/crashpad/fix-lib-name-conflict.patch Normal file
View File

@ -0,0 +1,44 @@
diff --git a/client/BUILD.gn b/client/BUILD.gn
index bd150ab..5cbf469 100644
--- a/client/BUILD.gn
+++ b/client/BUILD.gn
@@ -15,6 +15,7 @@
import("../build/crashpad_buildconfig.gni")
crashpad_static_library("client") {
+ output_name = "crashpad_client"
sources = [
"crashpad_client.h",
"prune_crash_reports.cc",
@@ -114,6 +115,7 @@ crashpad_static_library("client") {
}
static_library("common") {
+ output_name = "crashpad_client_common"
sources = [
"annotation.cc",
"annotation.h",
diff --git a/handler/BUILD.gn b/handler/BUILD.gn
index a2d6f7f..70a997e 100644
--- a/handler/BUILD.gn
+++ b/handler/BUILD.gn
@@ -94,6 +94,7 @@ if (crashpad_is_android) {
}
static_library("common") {
+ output_name = "crashpad_handler_common"
sources = [
"crash_report_upload_thread.cc",
"crash_report_upload_thread.h",
diff --git a/util/BUILD.gn b/util/BUILD.gn
index e7ff4a8..9efcb41 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -167,6 +167,7 @@ if (crashpad_is_win) {
}
crashpad_static_library("util") {
+ output_name = "crashpad_util"
sources = [
"file/delimited_file_reader.cc",
"file/delimited_file_reader.h",

2
ports/crashpad/portfile.cmake
View File

@ -6,6 +6,7 @@ vcpkg_from_git(
REF 7e0af1d4d45b526f01677e74a56f4a951b70517d
PATCHES
fix-linux.patch
fix-lib-name-conflict.patch
)
vcpkg_find_acquire_program(PYTHON3)
@ -19,6 +20,7 @@ if(NOT EXISTS "${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/BUILD.gn")
PATCHES
fix-std-20.patch
ndk-toolchain.diff
fix-lib-name-conflict-1.patch
)
file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/mini_chromium/mini_chromium")
file(RENAME "${mini_chromium}" "${SOURCE_PATH}/third_party/mini_chromium/mini_chromium")

2
ports/crashpad/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "crashpad",
"version-date": "2024-04-11",
"port-version": 2,
"port-version": 3,
"description": [
"Crashpad is a crash-reporting system.",
"Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss."

10
ports/openmvs/fix-build.patch
View File

@ -1,8 +1,8 @@
diff --git a/build/Templates/OpenMVSConfig.cmake.in b/build/Templates/OpenMVSConfig.cmake.in
index 9747b3e1..a8eb87df 100644
index 9747b3e..ed2347e 100644
--- a/build/Templates/OpenMVSConfig.cmake.in
+++ b/build/Templates/OpenMVSConfig.cmake.in
@@ -15,9 +15,67 @@ set(OpenMVS_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR_IN@")
@@ -15,9 +15,64 @@ set(OpenMVS_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR_IN@")
set(OpenMVS_DEFINITIONS "@OpenMVS_DEFINITIONS@")
@ -41,7 +41,7 @@ index 9747b3e1..a8eb87df 100644
+ add_definitions(${BREAKPAD_DEFINITIONS} -D_USE_BREAKPAD)
+endif()
+
+find_dependency(Boost)
+find_dependency(Boost COMPONENTS iostreams program_options system serialization)
+add_definitions(${Boost_DEFINITIONS} -D_USE_BOOST)
+include_directories(${Boost_INCLUDE_DIRS})
+find_dependency(Eigen3)
@ -52,9 +52,6 @@ index 9747b3e1..a8eb87df 100644
+find_dependency(CGAL)
+add_definitions(${CGAL_DEFINITIONS})
+
+find_dependency(VCG REQUIRED)
+add_definitions(${VCG_DEFINITIONS})
+
+if(@OpenMVS_USE_CERES@)
+ find_dependency(Ceres)
+ add_definitions(${CERES_DEFINITIONS})
@ -74,7 +71,6 @@ index 9747b3e1..a8eb87df 100644
-include("${CMAKE_CURRENT_LIST_DIR}/OpenMVSTargets.cmake")
-check_required_components("OpenMVS")
+set(OpenMVS_BINARIES InterfaceCOLMAP InterfaceMetashape InterfaceMVSNet DensifyPointCloud ReconstructMesh RefineMesh TextureMesh TransformScene Viewer)
diff --git a/build/Utils.cmake b/build/Utils.cmake
index 0cb2d8e1..62e1661f 100644
--- a/build/Utils.cmake

12
ports/openmvs/fix-lib-name-conflict.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/libs/Common/CMakeLists.txt b/libs/Common/CMakeLists.txt
index 18899af..1dd2c8d 100644
--- a/libs/Common/CMakeLists.txt
+++ b/libs/Common/CMakeLists.txt
@@ -16,6 +16,7 @@ TARGET_LINK_LIBRARIES(Common ${Boost_LIBRARIES} ${OpenCV_LIBS})
# Install
SET_TARGET_PROPERTIES(Common PROPERTIES
+ OUTPUT_NAME "OpenMVS_Common"
PUBLIC_HEADER "${LIBRARY_FILES_H}")
INSTALL(TARGETS Common
EXPORT OpenMVSTargets

1
ports/openmvs/portfile.cmake
View File

@ -10,6 +10,7 @@ vcpkg_from_github(
fix-build.patch
no-absolute-paths.patch
fix-static-build.patch
fix-lib-name-conflict.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

2
ports/openmvs/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "openmvs",
"version": "2.1.0",
"port-version": 5,
"port-version": 6,
"description": "OpenMVS: open Multi-View Stereo reconstruction library",
"homepage": "https://cdcseacave.github.io/openMVS",
"license": "AGPL-3.0-only",

4
versions/baseline.json
View File

@ -2018,7 +2018,7 @@
},
"crashpad": {
"baseline": "2024-04-11",
"port-version": 2
"port-version": 3
},
"crashrpt": {
"baseline": "1.4.3",
@ -6638,7 +6638,7 @@
},
"openmvs": {
"baseline": "2.1.0",
"port-version": 5
"port-version": 6
},
"openni2": {
"baseline": "2.2.0.33",

5
versions/c-/crashpad.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3c65a9330a2d6d53ab6afad83ec165e708b1cc4e",
"version-date": "2024-04-11",
"port-version": 3
},
{
"git-tree": "a8c3dac7327cb12c8f1885797a7d63ed99b6963c",
"version-date": "2024-04-11",

5
versions/o-/openmvs.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "369a7d4c69c78fa832f60105f1a132860eff111a",
"version": "2.1.0",
"port-version": 6
},
{
"git-tree": "43075275b943fe5d74faef9ae858c8e8ed5a5735",
"version": "2.1.0",