Spaces:
Sleeping
Sleeping
e9b120182d839e03ddcd01f9b12100386238a0ce46da298ab6a6a0c9e2399db5
Browse files- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppgraphqlgen/portfile.cmake +34 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppgraphqlgen/vcpkg.json +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppitertools/portfile.cmake +25 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppitertools/vcpkg.json +10 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppkafka/fix-dynamic.patch +12 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppkafka/portfile.cmake +32 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppkafka/vcpkg.json +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppmicroservices/fix-dependency-gtest.patch +24 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppmicroservices/fix-warning-c4834.patch +25 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppmicroservices/portfile.cmake +36 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppmicroservices/vcpkg.json +9 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppmicroservices/werror.patch +13 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpprestsdk/fix-find-openssl.patch +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpprestsdk/portfile.cmake +53 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpprestsdk/vcpkg.json +122 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpptoml/portfile.cmake +14 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpptoml/vcpkg.json +6 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppunit/CMakeLists.txt +51 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppunit/CppUnitConfig.cmake +83 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppunit/portfile.cmake +62 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppunit/vcpkg.json +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpputest/fix-arm-build-error.patch +20 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpputest/portfile.cmake +60 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpputest/vcpkg.json +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppwinrt/portfile.cmake +10 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppwinrt/vcpkg.json +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppxaml/portfile.cmake +11 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppxaml/vcpkg.json +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppzmq/portfile.cmake +27 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppzmq/vcpkg.json +22 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpr/001-cpr-config.patch +15 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpr/portfile.cmake +33 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpr/vcpkg.json +42 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpu-features/make_list_cpu_features_optional.patch +70 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpu-features/portfile.cmake +35 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpu-features/vcpkg.json +24 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpuid/portfile.cmake +27 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpuid/vcpkg.json +18 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpuinfo/portfile.cmake +76 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpuinfo/vcpkg.json +23 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cr/portfile.cmake +15 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/cr/vcpkg.json +7 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashpad/crashpadConfig.cmake.in +31 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashpad/portfile.cmake +125 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashpad/vcpkg.json +14 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashpad/zlib.gn +15 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashrpt/001-add-install-target-and-find-deps.patch +809 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashrpt/portfile.cmake +52 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashrpt/vcpkg.json +38 -0
- third-party/DPVO/Pangolin/scripts/vcpkg/ports/crc32c/portfile.cmake +31 -0
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppgraphqlgen/portfile.cmake
ADDED
@@ -0,0 +1,34 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO microsoft/cppgraphqlgen
|
4 |
+
REF v4.1.1
|
5 |
+
SHA512 20987f03719558cec2fac8aee5a94e59c5e833a318361aef802f39bc369af141fef0c7f2d3bb35324d44d289843564c2f7e890419f871bfd8e5d7d5de53b363e
|
6 |
+
HEAD_REF main
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_cmake_configure(
|
10 |
+
SOURCE_PATH ${SOURCE_PATH}
|
11 |
+
OPTIONS
|
12 |
+
-DGRAPHQL_BUILD_TESTS=OFF
|
13 |
+
-DGRAPHQL_UPDATE_VERSION=OFF
|
14 |
+
-DGRAPHQL_UPDATE_SAMPLES=OFF
|
15 |
+
-DGRAPHQL_INSTALL_CONFIGURATIONS=Release
|
16 |
+
OPTIONS_RELEASE
|
17 |
+
-DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share
|
18 |
+
-DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/tools
|
19 |
+
OPTIONS_DEBUG
|
20 |
+
-DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share
|
21 |
+
-DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/debug/tools
|
22 |
+
)
|
23 |
+
|
24 |
+
vcpkg_cmake_install()
|
25 |
+
|
26 |
+
vcpkg_cmake_config_fixup()
|
27 |
+
|
28 |
+
vcpkg_copy_tools(
|
29 |
+
TOOL_NAMES schemagen clientgen
|
30 |
+
SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen)
|
31 |
+
|
32 |
+
vcpkg_copy_pdbs()
|
33 |
+
|
34 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppgraphqlgen/vcpkg.json
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cppgraphqlgen",
|
3 |
+
"version-semver": "4.1.1",
|
4 |
+
"description": "C++ GraphQL schema service generator",
|
5 |
+
"homepage": "https://github.com/microsoft/cppgraphqlgen",
|
6 |
+
"license": "MIT",
|
7 |
+
"dependencies": [
|
8 |
+
"boost-program-options",
|
9 |
+
"pegtl",
|
10 |
+
"rapidjson",
|
11 |
+
{
|
12 |
+
"name": "vcpkg-cmake",
|
13 |
+
"host": true
|
14 |
+
},
|
15 |
+
{
|
16 |
+
"name": "vcpkg-cmake-config",
|
17 |
+
"host": true
|
18 |
+
}
|
19 |
+
]
|
20 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppitertools/portfile.cmake
ADDED
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO ryanhaining/cppitertools
|
4 |
+
REF 539a5be8359c4330b3f88ed1821f32bb5c89f5f6
|
5 |
+
SHA512 cab0cb8a6b711824c13ca013b3349b9decb84f2dab6305bfb1bdd013f7426d5b199c127dadabeaaafc2e7ff6ad442222dd0fffee9aaacfa27d3aeb82c344ae4f
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_configure_cmake(
|
10 |
+
SOURCE_PATH ${SOURCE_PATH}
|
11 |
+
PREFER_NINJA
|
12 |
+
OPTIONS
|
13 |
+
-Dcppitertools_INSTALL_CMAKE_DIR=share
|
14 |
+
)
|
15 |
+
|
16 |
+
vcpkg_install_cmake()
|
17 |
+
|
18 |
+
file(REMOVE_RECURSE
|
19 |
+
${CURRENT_PACKAGES_DIR}/debug
|
20 |
+
${CURRENT_PACKAGES_DIR}/share/cppitertools-config-version.cmake)
|
21 |
+
|
22 |
+
# Handle copyright
|
23 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE.md
|
24 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppitertools
|
25 |
+
RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppitertools/vcpkg.json
ADDED
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cppitertools",
|
3 |
+
"version": "2.1",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "Range-based for loop add-ons inspired by the Python builtins and itertools library",
|
6 |
+
"homepage": "https://github.com/ryanhaining/cppitertools",
|
7 |
+
"dependencies": [
|
8 |
+
"boost-optional"
|
9 |
+
]
|
10 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppkafka/fix-dynamic.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
2 |
+
index 5d31078..b1d3634 100644
|
3 |
+
--- a/src/CMakeLists.txt
|
4 |
+
+++ b/src/CMakeLists.txt
|
5 |
+
@@ -43,6 +43,7 @@ target_include_directories(cppkafka PUBLIC ${PROJECT_SOURCE_DIR}/include)
|
6 |
+
|
7 |
+
install(
|
8 |
+
TARGETS cppkafka
|
9 |
+
+ RUNTIME DESTINATION bin
|
10 |
+
LIBRARY DESTINATION lib
|
11 |
+
ARCHIVE DESTINATION lib
|
12 |
+
COMPONENT dev
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppkafka/portfile.cmake
ADDED
@@ -0,0 +1,32 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO mfontanini/cppkafka
|
4 |
+
REF v0.3.1
|
5 |
+
SHA512 60d01ce1dd9bd9119676be939ed5ab03539abb1f945c1b31e432edfe0f06542778f7fef37696f5ff19c53024f44d5cbd8aeddbbb231c38b098e05285d3ff0cab
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES fix-dynamic.patch
|
8 |
+
)
|
9 |
+
|
10 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
11 |
+
set(CPPKAFKA_BUILD_SHARED OFF)
|
12 |
+
else()
|
13 |
+
set(CPPKAFKA_BUILD_SHARED ON)
|
14 |
+
endif()
|
15 |
+
|
16 |
+
vcpkg_configure_cmake(
|
17 |
+
SOURCE_PATH ${SOURCE_PATH}
|
18 |
+
PREFER_NINJA
|
19 |
+
OPTIONS
|
20 |
+
-DCPPKAFKA_BUILD_SHARED=${CPPKAFKA_BUILD_SHARED}
|
21 |
+
-DCPPKAFKA_DISABLE_TESTS=ON
|
22 |
+
-DCPPKAFKA_DISABLE_EXAMPLES=ON
|
23 |
+
)
|
24 |
+
|
25 |
+
vcpkg_install_cmake()
|
26 |
+
|
27 |
+
vcpkg_copy_pdbs()
|
28 |
+
|
29 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
30 |
+
|
31 |
+
# Handle copyright
|
32 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppkafka/vcpkg.json
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cppkafka",
|
3 |
+
"version-string": "0.3.1",
|
4 |
+
"port-version": 3,
|
5 |
+
"description": "cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol. The library is built on top of librdkafka, and provides a high level API that uses modern C++ features to make it easier to write code while keeping the wrapper's performance overhead to a minimum.",
|
6 |
+
"homepage": "https://github.com/mfontanini/cppkafka",
|
7 |
+
"dependencies": [
|
8 |
+
"boost-program-options",
|
9 |
+
"librdkafka"
|
10 |
+
]
|
11 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppmicroservices/fix-dependency-gtest.patch
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 136edff..9d29522 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -288,6 +288,10 @@ if(US_COMPILER_APPLE_CLANG OR US_COMPILER_CLANG)
|
6 |
+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
|
7 |
+
endif()
|
8 |
+
|
9 |
+
+# Dependency
|
10 |
+
+find_package(GTest CONFIG REQUIRED)
|
11 |
+
+link_libraries(GTest::gtest GTest::gmock)
|
12 |
+
+
|
13 |
+
#-----------------------------------------------------------------------------
|
14 |
+
# Testing configuration
|
15 |
+
#-----------------------------------------------------------------------------
|
16 |
+
@@ -338,7 +342,7 @@ if(US_BUILD_TESTING)
|
17 |
+
endif()
|
18 |
+
|
19 |
+
if(US_USE_SYSTEM_GTEST)
|
20 |
+
- find_package(GTest REQUIRED)
|
21 |
+
+ find_package(GTest CONFIG REQUIRED)
|
22 |
+
else()
|
23 |
+
# This keeps GTest CMake variables hidden from users unless they explicitly want to view/modify them.
|
24 |
+
us_cache_var(BUILD_GMOCK ON BOOL "Build GMock" ADVANCED FORCE)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppmicroservices/fix-warning-c4834.patch
ADDED
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/httpservice/src/ServletContainer.cpp b/httpservice/src/ServletContainer.cpp
|
2 |
+
index b4af8c9..8713066 100644
|
3 |
+
--- a/httpservice/src/ServletContainer.cpp
|
4 |
+
+++ b/httpservice/src/ServletContainer.cpp
|
5 |
+
@@ -279,7 +279,9 @@ void ServletContainer::SetContextPath(const std::string& path)
|
6 |
+
|
7 |
+
std::string ServletContainer::GetContextPath() const
|
8 |
+
{
|
9 |
+
- return Lock(d->m_Mutex), d->m_ContextPath;
|
10 |
+
+ Lock l(d->m_Mutex);
|
11 |
+
+ US_UNUSED(l);
|
12 |
+
+ return d->m_ContextPath;
|
13 |
+
}
|
14 |
+
|
15 |
+
void ServletContainer::Start()
|
16 |
+
@@ -306,6 +308,8 @@ std::shared_ptr<ServletContext> ServletContainer::GetContext(
|
17 |
+
std::string ServletContainer::GetContextPath(
|
18 |
+
const ServletContext* /*context*/) const
|
19 |
+
{
|
20 |
+
- return Lock(d->m_Mutex), d->m_ContextPath;
|
21 |
+
+ Lock l(d->m_Mutex);
|
22 |
+
+ US_UNUSED(l);
|
23 |
+
+ return d->m_ContextPath;
|
24 |
+
}
|
25 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppmicroservices/portfile.cmake
ADDED
@@ -0,0 +1,36 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO CppMicroServices/CppMicroservices
|
4 |
+
REF v3.6.0
|
5 |
+
SHA512 C1407E1D3C2FD31675C32D8C00F7D005C09B03A835D5B09411B0043DDEAF5E3A1A0C7A5FA34FA04D5A643169D222D0E8D3A3C31CDA69FB64CDF1A8CCA276BE18
|
6 |
+
HEAD_REF development
|
7 |
+
PATCHES
|
8 |
+
werror.patch
|
9 |
+
fix-dependency-gtest.patch
|
10 |
+
fix-warning-c4834.patch
|
11 |
+
)
|
12 |
+
|
13 |
+
vcpkg_configure_cmake(
|
14 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
15 |
+
PREFER_NINJA
|
16 |
+
OPTIONS
|
17 |
+
-DTOOLS_INSTALL_DIR:STRING=tools/cppmicroservices
|
18 |
+
-DAUXILIARY_INSTALL_DIR:STRING=share/cppmicroservices
|
19 |
+
-DUS_USE_SYSTEM_GTEST=TRUE
|
20 |
+
)
|
21 |
+
|
22 |
+
vcpkg_install_cmake()
|
23 |
+
|
24 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
25 |
+
|
26 |
+
vcpkg_fixup_cmake_targets()
|
27 |
+
|
28 |
+
# Handle copyright
|
29 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
30 |
+
|
31 |
+
# CppMicroServices uses a custom resource compiler to compile resources
|
32 |
+
# the zipped resources are then appended to the target which cause the linker to crash
|
33 |
+
# when compiling a static library
|
34 |
+
if(NOT BUILD_SHARED_LIBS)
|
35 |
+
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
36 |
+
endif()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppmicroservices/vcpkg.json
ADDED
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cppmicroservices",
|
3 |
+
"version": "3.6.0",
|
4 |
+
"description": "An OSGi-like C++ dynamic module system and service registry",
|
5 |
+
"homepage": "https://github.com/CppMicroServices/CppMicroServices",
|
6 |
+
"dependencies": [
|
7 |
+
"gtest"
|
8 |
+
]
|
9 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppmicroservices/werror.patch
ADDED
@@ -0,0 +1,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 24fd87e..974064c 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -382,7 +382,7 @@ else()
|
6 |
+
usFunctionCheckCompilerFlags(-fstack-protector-all US_CXX_FLAGS)
|
7 |
+
endif()
|
8 |
+
|
9 |
+
- foreach(_cxxflag -Werror -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align
|
10 |
+
+ foreach(_cxxflag -Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align
|
11 |
+
-Wwrite-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast
|
12 |
+
-Wstrict-null-sentinel -Wsign-promo -fdiagnostics-show-option )
|
13 |
+
usFunctionCheckCompilerFlags(${_cxxflag} US_CXX_FLAGS)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpprestsdk/fix-find-openssl.patch
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/Release/cmake/cpprest_find_openssl.cmake b/Release/cmake/cpprest_find_openssl.cmake
|
2 |
+
index 9333663..c1df089 100644
|
3 |
+
--- a/Release/cmake/cpprest_find_openssl.cmake
|
4 |
+
+++ b/Release/cmake/cpprest_find_openssl.cmake
|
5 |
+
@@ -36,8 +36,11 @@ function(cpprest_find_openssl)
|
6 |
+
# Prefer a homebrew version of OpenSSL over the one in /usr/lib
|
7 |
+
file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl*/*)
|
8 |
+
# Prefer the latest (make the latest one first)
|
9 |
+
- list(REVERSE OPENSSL_ROOT_DIR)
|
10 |
+
- list(GET OPENSSL_ROOT_DIR 0 OPENSSL_ROOT_DIR)
|
11 |
+
+ if(OPENSSL_ROOT_DIR)
|
12 |
+
+ # Prefer the latest (make the latest one first)
|
13 |
+
+ list(REVERSE OPENSSL_ROOT_DIR)
|
14 |
+
+ list(GET OPENSSL_ROOT_DIR 0 OPENSSL_ROOT_DIR)
|
15 |
+
+ endif()
|
16 |
+
endif()
|
17 |
+
# This should prevent linking against the system provided 0.9.8y
|
18 |
+
message(STATUS "OPENSSL_ROOT_DIR = ${OPENSSL_ROOT_DIR}")
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpprestsdk/portfile.cmake
ADDED
@@ -0,0 +1,53 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO Microsoft/cpprestsdk
|
4 |
+
REF 122d09549201da5383321d870bed45ecb9e168c5
|
5 |
+
SHA512 c9ded33d3c67880e2471e479a38b40a14a9ff45d241e928b6339eca697b06ad621846260eca47b6b1b8a2bc9ab7bf4fea8d3e8e795cd430d8839beb530e16dd7
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES fix-find-openssl.patch
|
8 |
+
)
|
9 |
+
|
10 |
+
set(OPTIONS)
|
11 |
+
if(NOT VCPKG_TARGET_IS_UWP)
|
12 |
+
SET(WEBSOCKETPP_PATH "${CURRENT_INSTALLED_DIR}/share/websocketpp")
|
13 |
+
list(APPEND OPTIONS
|
14 |
+
-DWEBSOCKETPP_CONFIG=${WEBSOCKETPP_PATH}
|
15 |
+
-DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH})
|
16 |
+
endif()
|
17 |
+
|
18 |
+
vcpkg_check_features(
|
19 |
+
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
20 |
+
INVERTED_FEATURES
|
21 |
+
brotli CPPREST_EXCLUDE_BROTLI
|
22 |
+
compression CPPREST_EXCLUDE_COMPRESSION
|
23 |
+
websockets CPPREST_EXCLUDE_WEBSOCKETS
|
24 |
+
)
|
25 |
+
|
26 |
+
vcpkg_configure_cmake(
|
27 |
+
SOURCE_PATH ${SOURCE_PATH}/Release
|
28 |
+
PREFER_NINJA
|
29 |
+
OPTIONS
|
30 |
+
${OPTIONS}
|
31 |
+
${FEATURE_OPTIONS}
|
32 |
+
-DBUILD_TESTS=OFF
|
33 |
+
-DBUILD_SAMPLES=OFF
|
34 |
+
-DCPPREST_EXPORT_DIR=share/cpprestsdk
|
35 |
+
-DWERROR=OFF
|
36 |
+
-DPKG_CONFIG_EXECUTABLE=FALSE
|
37 |
+
OPTIONS_DEBUG
|
38 |
+
-DCPPREST_INSTALL_HEADERS=OFF
|
39 |
+
)
|
40 |
+
|
41 |
+
vcpkg_install_cmake()
|
42 |
+
|
43 |
+
vcpkg_copy_pdbs()
|
44 |
+
|
45 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/${PORT})
|
46 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share)
|
47 |
+
|
48 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
49 |
+
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/cpprest/details/cpprest_compat.h
|
50 |
+
"#ifdef _NO_ASYNCRTIMP" "#if 1")
|
51 |
+
endif()
|
52 |
+
|
53 |
+
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpprestsdk/vcpkg.json
ADDED
@@ -0,0 +1,122 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cpprestsdk",
|
3 |
+
"version-string": "2.10.18",
|
4 |
+
"description": [
|
5 |
+
"C++11 JSON, REST, and OAuth library",
|
6 |
+
"The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services."
|
7 |
+
],
|
8 |
+
"homepage": "https://github.com/Microsoft/cpprestsdk",
|
9 |
+
"dependencies": [
|
10 |
+
{
|
11 |
+
"name": "boost-asio",
|
12 |
+
"platform": "!uwp & !windows"
|
13 |
+
},
|
14 |
+
{
|
15 |
+
"name": "boost-chrono",
|
16 |
+
"platform": "!uwp & !windows"
|
17 |
+
},
|
18 |
+
{
|
19 |
+
"name": "boost-date-time",
|
20 |
+
"platform": "!uwp & !windows"
|
21 |
+
},
|
22 |
+
{
|
23 |
+
"name": "boost-filesystem",
|
24 |
+
"platform": "!uwp & !windows"
|
25 |
+
},
|
26 |
+
{
|
27 |
+
"name": "boost-random",
|
28 |
+
"platform": "!uwp & !windows"
|
29 |
+
},
|
30 |
+
{
|
31 |
+
"name": "boost-regex",
|
32 |
+
"platform": "!uwp & !windows"
|
33 |
+
},
|
34 |
+
{
|
35 |
+
"name": "boost-system",
|
36 |
+
"platform": "!uwp & !windows"
|
37 |
+
},
|
38 |
+
{
|
39 |
+
"name": "boost-thread",
|
40 |
+
"platform": "!uwp & !windows"
|
41 |
+
},
|
42 |
+
{
|
43 |
+
"name": "openssl",
|
44 |
+
"platform": "!uwp & !windows"
|
45 |
+
}
|
46 |
+
],
|
47 |
+
"default-features": [
|
48 |
+
"default-features"
|
49 |
+
],
|
50 |
+
"features": {
|
51 |
+
"brotli": {
|
52 |
+
"description": "Brotli compression support",
|
53 |
+
"dependencies": [
|
54 |
+
"brotli",
|
55 |
+
{
|
56 |
+
"name": "cpprestsdk",
|
57 |
+
"default-features": false,
|
58 |
+
"features": [
|
59 |
+
"compression"
|
60 |
+
]
|
61 |
+
}
|
62 |
+
]
|
63 |
+
},
|
64 |
+
"compression": {
|
65 |
+
"description": "HTTP Compression support",
|
66 |
+
"dependencies": [
|
67 |
+
"zlib"
|
68 |
+
]
|
69 |
+
},
|
70 |
+
"default-features": {
|
71 |
+
"description": "Features installed by default",
|
72 |
+
"dependencies": [
|
73 |
+
{
|
74 |
+
"name": "cpprestsdk",
|
75 |
+
"default-features": false,
|
76 |
+
"features": [
|
77 |
+
"compression"
|
78 |
+
]
|
79 |
+
},
|
80 |
+
{
|
81 |
+
"name": "cpprestsdk",
|
82 |
+
"features": [
|
83 |
+
"brotli"
|
84 |
+
],
|
85 |
+
"platform": "windows"
|
86 |
+
}
|
87 |
+
]
|
88 |
+
},
|
89 |
+
"websockets": {
|
90 |
+
"description": "Websockets support",
|
91 |
+
"dependencies": [
|
92 |
+
{
|
93 |
+
"name": "boost-date-time",
|
94 |
+
"platform": "!uwp"
|
95 |
+
},
|
96 |
+
{
|
97 |
+
"name": "boost-regex",
|
98 |
+
"platform": "!uwp"
|
99 |
+
},
|
100 |
+
{
|
101 |
+
"name": "boost-system",
|
102 |
+
"platform": "!uwp"
|
103 |
+
},
|
104 |
+
{
|
105 |
+
"name": "cpprestsdk",
|
106 |
+
"default-features": false,
|
107 |
+
"features": [
|
108 |
+
"compression"
|
109 |
+
]
|
110 |
+
},
|
111 |
+
{
|
112 |
+
"name": "openssl",
|
113 |
+
"platform": "!uwp"
|
114 |
+
},
|
115 |
+
{
|
116 |
+
"name": "websocketpp",
|
117 |
+
"platform": "!uwp"
|
118 |
+
}
|
119 |
+
]
|
120 |
+
}
|
121 |
+
}
|
122 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpptoml/portfile.cmake
ADDED
@@ -0,0 +1,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO skystrife/cpptoml
|
4 |
+
|
5 |
+
REF fededad7169e538ca47e11a9ee9251bc361a9a65
|
6 |
+
SHA512 2ec50f4585bca33bb343170470048a7d7e7902f1ffa5709cf84ddf9f53a899ff1cc9ffa49e059f6dad93d13823c4d2661bc8109e4356078cdbdfef1a2be6a622
|
7 |
+
|
8 |
+
HEAD_REF master
|
9 |
+
)
|
10 |
+
|
11 |
+
file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h")
|
12 |
+
|
13 |
+
# Handle copyright
|
14 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpptoml RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpptoml/vcpkg.json
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cpptoml",
|
3 |
+
"version-string": "v0.1.1",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "A header-only library for parsing TOML configuration files."
|
6 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppunit/CMakeLists.txt
ADDED
@@ -0,0 +1,51 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
project(cppunit)
|
2 |
+
cmake_minimum_required(VERSION 2.8.12)
|
3 |
+
|
4 |
+
set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin"
|
5 |
+
CACHE PATH "Installation directory for executables"
|
6 |
+
)
|
7 |
+
set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib"
|
8 |
+
CACHE PATH "Installation directory for libraries"
|
9 |
+
)
|
10 |
+
set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include"
|
11 |
+
CACHE PATH "Installation directory for headers"
|
12 |
+
)
|
13 |
+
|
14 |
+
file(GLOB CPPUNIT_SRC RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
|
15 |
+
"${CMAKE_CURRENT_SOURCE_DIR}/src/cppunit/*.cpp")
|
16 |
+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
|
17 |
+
|
18 |
+
set(DLLPLUGINTESTER_SRC
|
19 |
+
${CMAKE_CURRENT_SOURCE_DIR}/src/DllPlugInTester/CommandLineParser.cpp
|
20 |
+
${CMAKE_CURRENT_SOURCE_DIR}/src/DllPlugInTester/DllPlugInTester.cpp
|
21 |
+
)
|
22 |
+
|
23 |
+
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/DllPlugInTester)
|
24 |
+
|
25 |
+
if(WIN32)
|
26 |
+
set(CMAKE_DEBUG_POSTFIX d)
|
27 |
+
endif()
|
28 |
+
|
29 |
+
if(BUILD_SHARED_LIBS)
|
30 |
+
add_library(cppunit SHARED ${CPPUNIT_SRC})
|
31 |
+
add_definitions(-DCPPUNIT_BUILD_DLL)
|
32 |
+
else()
|
33 |
+
add_library(cppunit STATIC ${CPPUNIT_SRC})
|
34 |
+
endif()
|
35 |
+
|
36 |
+
add_executable(DllPlugInTester ${DLLPLUGINTESTER_SRC})
|
37 |
+
target_link_libraries(DllPlugInTester cppunit)
|
38 |
+
|
39 |
+
install(TARGETS cppunit
|
40 |
+
RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
|
41 |
+
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
|
42 |
+
LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
|
43 |
+
)
|
44 |
+
|
45 |
+
install(TARGETS DllPlugInTester
|
46 |
+
RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
|
47 |
+
)
|
48 |
+
|
49 |
+
install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/cppunit"
|
50 |
+
DESTINATION "${INSTALL_INC_DIR}"
|
51 |
+
)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppunit/CppUnitConfig.cmake
ADDED
@@ -0,0 +1,83 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
|
2 |
+
include(SelectLibraryConfigurations)
|
3 |
+
|
4 |
+
find_path(CppUnit_INCLUDE_DIR TestCase.h PATH_SUFFIXES cppunit)
|
5 |
+
find_library(CppUnit_LIBRARY_RELEASE NAMES cppunit PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" NO_DEFAULT_PATH)
|
6 |
+
find_library(CppUnit_LIBRARY_DEBUG NAMES cppunitd cppunit PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" NO_DEFAULT_PATH)
|
7 |
+
select_library_configurations(CppUnit)
|
8 |
+
|
9 |
+
if(NOT CppUnit_LIBRARY)
|
10 |
+
set(CppUnit_FOUND FALSE)
|
11 |
+
set(CPPUNIT_FOUND FALSE)
|
12 |
+
return()
|
13 |
+
endif()
|
14 |
+
|
15 |
+
if(WIN32)
|
16 |
+
find_file(CppUnit_LIBRARY_RELEASE_DLL NAMES cppunit.dll PATHS "${CMAKE_CURRENT_LIST_DIR}/../../bin" NO_DEFAULT_PATH)
|
17 |
+
find_file(CppUnit_LIBRARY_DEBUG_DLL NAMES cppunitd.dll PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/bin" NO_DEFAULT_PATH)
|
18 |
+
endif()
|
19 |
+
|
20 |
+
# Manage Release Windows shared
|
21 |
+
if(EXISTS "${CppUnit_LIBRARY_RELEASE_DLL}")
|
22 |
+
add_library(CppUnit SHARED IMPORTED)
|
23 |
+
set_target_properties(CppUnit PROPERTIES
|
24 |
+
IMPORTED_CONFIGURATIONS Release
|
25 |
+
IMPORTED_LOCATION_RELEASE "${CppUnit_LIBRARY_RELEASE_DLL}"
|
26 |
+
IMPORTED_IMPLIB_RELEASE "${CppUnit_LIBRARY_RELEASE}"
|
27 |
+
INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}"
|
28 |
+
)
|
29 |
+
endif()
|
30 |
+
|
31 |
+
# Manage Debug Windows shared
|
32 |
+
if(EXISTS "${CppUnit_LIBRARY_DEBUG_DLL}")
|
33 |
+
if(EXISTS "${CppUnit_LIBRARY_RELEASE_DLL}")
|
34 |
+
set_target_properties(CppUnit PROPERTIES
|
35 |
+
IMPORTED_CONFIGURATIONS "Release;Debug"
|
36 |
+
IMPORTED_LOCATION_RELEASE "${CppUnit_LIBRARY_RELEASE_DLL}"
|
37 |
+
IMPORTED_IMPLIB_RELEASE "${CppUnit_LIBRARY_RELEASE}"
|
38 |
+
IMPORTED_LOCATION_DEBUG "${CppUnit_LIBRARY_DEBUG_DLL}"
|
39 |
+
IMPORTED_IMPLIB_DEBUG "${CppUnit_LIBRARY_DEBUG}"
|
40 |
+
INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}"
|
41 |
+
)
|
42 |
+
else()
|
43 |
+
add_library(CppUnit SHARED IMPORTED)
|
44 |
+
set_target_properties(CppUnit PROPERTIES
|
45 |
+
IMPORTED_CONFIGURATIONS Debug
|
46 |
+
IMPORTED_LOCATION_DEBUG "${CppUnit_LIBRARY_DEBUG_DLL"
|
47 |
+
IMPORTED_IMPLIB_DEBUG "${CppUnit_LIBRARY_DEBUG}"
|
48 |
+
INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}"
|
49 |
+
)
|
50 |
+
endif()
|
51 |
+
endif()
|
52 |
+
|
53 |
+
# Manage Release Windows static and Linux shared/static
|
54 |
+
if((NOT EXISTS "${CppUnit_LIBRARY_RELEASE_DLL}") AND (EXISTS "${CppUnit_LIBRARY_RELEASE}"))
|
55 |
+
add_library(CppUnit UNKNOWN IMPORTED)
|
56 |
+
set_target_properties(CppUnit PROPERTIES
|
57 |
+
IMPORTED_CONFIGURATIONS Release
|
58 |
+
IMPORTED_LOCATION_RELEASE "${CppUnit_LIBRARY_RELEASE}"
|
59 |
+
INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}"
|
60 |
+
)
|
61 |
+
endif()
|
62 |
+
|
63 |
+
# Manage Debug Windows static and Linux shared/static
|
64 |
+
if((NOT EXISTS "${CppUnit_LIBRARY_DEBUG_DLL}") AND (EXISTS "${CppUnit_LIBRARY_DEBUG}"))
|
65 |
+
if(EXISTS "${CppUnit_LIBRARY_RELEASE}")
|
66 |
+
set_target_properties(CppUnit PROPERTIES
|
67 |
+
IMPORTED_CONFIGURATIONS "Release;Debug"
|
68 |
+
IMPORTED_LOCATION_RELEASE "${CppUnit_LIBRARY_RELEASE}"
|
69 |
+
IMPORTED_LOCATION_DEBUG "${CppUnit_LIBRARY_DEBUG}"
|
70 |
+
INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}"
|
71 |
+
)
|
72 |
+
else()
|
73 |
+
add_library(CppUnit UNKNOWN IMPORTED)
|
74 |
+
set_target_properties(CppUnit PROPERTIES
|
75 |
+
IMPORTED_CONFIGURATIONS Debug
|
76 |
+
IMPORTED_LOCATION_DEBUG "${CppUnit_LIBRARY_DEBUG}"
|
77 |
+
INTERFACE_INCLUDE_DIRECTORIES "${CppUnit_INCLUDE_DIR}"
|
78 |
+
)
|
79 |
+
endif()
|
80 |
+
endif()
|
81 |
+
|
82 |
+
set(CppUnit_FOUND TRUE)
|
83 |
+
set(CPPUNIT_FOUND TRUE)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppunit/portfile.cmake
ADDED
@@ -0,0 +1,62 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_download_distfile(ARCHIVE
|
2 |
+
URLS "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"
|
3 |
+
FILENAME "cppunit-1.15.1.tar.gz"
|
4 |
+
SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691
|
5 |
+
)
|
6 |
+
|
7 |
+
vcpkg_extract_source_archive_ex(
|
8 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
9 |
+
ARCHIVE "${ARCHIVE}"
|
10 |
+
)
|
11 |
+
|
12 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
13 |
+
# Use a simple CMakeLists.txt to build CppUnit on windows
|
14 |
+
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
|
15 |
+
|
16 |
+
vcpkg_cmake_configure(
|
17 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
18 |
+
)
|
19 |
+
|
20 |
+
vcpkg_cmake_install()
|
21 |
+
|
22 |
+
# Move EXE to 'tools'
|
23 |
+
vcpkg_copy_tools(TOOL_NAMES DllPlugInTester AUTO_CLEAN)
|
24 |
+
else()
|
25 |
+
# Use a configure on unix. It should be doable to use the cmake, but may require some patching
|
26 |
+
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
27 |
+
set(LINKAGE_DYNAMIC yes)
|
28 |
+
set(LINKAGE_STATIC no)
|
29 |
+
else()
|
30 |
+
set(LINKAGE_DYNAMIC no)
|
31 |
+
set(LINKAGE_STATIC yes)
|
32 |
+
endif()
|
33 |
+
|
34 |
+
vcpkg_configure_make(
|
35 |
+
SOURCE_PATH ${SOURCE_PATH}
|
36 |
+
AUTOCONFIG
|
37 |
+
OPTIONS
|
38 |
+
"--enable-shared=${LINKAGE_DYNAMIC}"
|
39 |
+
"--enable-static=${LINKAGE_STATIC}"
|
40 |
+
"--prefix=${CURRENT_INSTALLED_DIR}"
|
41 |
+
"--disable-doxygen"
|
42 |
+
OPTIONS_DEBUG
|
43 |
+
"--enable-debug"
|
44 |
+
)
|
45 |
+
|
46 |
+
vcpkg_install_make()
|
47 |
+
endif()
|
48 |
+
|
49 |
+
vcpkg_copy_pdbs()
|
50 |
+
vcpkg_fixup_pkgconfig()
|
51 |
+
|
52 |
+
# Handle copyright
|
53 |
+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
54 |
+
|
55 |
+
# Install CppUnitConfig.cmake
|
56 |
+
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/CppUnitConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
57 |
+
|
58 |
+
# Cleanup
|
59 |
+
file(REMOVE_RECURSE
|
60 |
+
"${CURRENT_PACKAGES_DIR}/debug/include"
|
61 |
+
"${CURRENT_PACKAGES_DIR}/debug/share"
|
62 |
+
)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppunit/vcpkg.json
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cppunit",
|
3 |
+
"version": "1.15.1",
|
4 |
+
"port-version": 3,
|
5 |
+
"description": "Unit testing framework module for the C++ programming language",
|
6 |
+
"homepage": "https://www.freedesktop.org/wiki/Software/cppunit",
|
7 |
+
"supports": "!uwp",
|
8 |
+
"dependencies": [
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true,
|
12 |
+
"platform": "windows"
|
13 |
+
},
|
14 |
+
{
|
15 |
+
"name": "vcpkg-cmake-config",
|
16 |
+
"host": true,
|
17 |
+
"platform": "windows"
|
18 |
+
}
|
19 |
+
]
|
20 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpputest/fix-arm-build-error.patch
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/tests/CppUTest/CMakeLists.txt b/tests/CppUTest/CMakeLists.txt
|
2 |
+
index 7df07c1..d7317aa 100644
|
3 |
+
--- a/tests/CppUTest/CMakeLists.txt
|
4 |
+
+++ b/tests/CppUTest/CMakeLists.txt
|
5 |
+
@@ -56,4 +56,4 @@ add_executable(CppUTestTests ${CppUTestTests_src})
|
6 |
+
cpputest_normalize_test_output_location(CppUTestTests)
|
7 |
+
target_link_libraries(CppUTestTests CppUTest ${THREAD_LIB})
|
8 |
+
|
9 |
+
-cpputest_buildtime_discover_tests(CppUTestTests)
|
10 |
+
+#cpputest_buildtime_discover_tests(CppUTestTests)
|
11 |
+
diff --git a/tests/CppUTestExt/CMakeLists.txt b/tests/CppUTestExt/CMakeLists.txt
|
12 |
+
index b83ceb2..2abf274 100644
|
13 |
+
--- a/tests/CppUTestExt/CMakeLists.txt
|
14 |
+
+++ b/tests/CppUTestExt/CMakeLists.txt
|
15 |
+
@@ -37,4 +37,4 @@ endif (MINGW)
|
16 |
+
add_executable(CppUTestExtTests ${CppUTestExtTests_src})
|
17 |
+
cpputest_normalize_test_output_location(CppUTestExtTests)
|
18 |
+
target_link_libraries(CppUTestExtTests CppUTest CppUTestExt ${THREAD_LIB} ${CPPUNIT_EXTERNAL_LIBRARIES})
|
19 |
+
-cpputest_buildtime_discover_tests(CppUTestExtTests)
|
20 |
+
+#cpputest_buildtime_discover_tests(CppUTestExtTests)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpputest/portfile.cmake
ADDED
@@ -0,0 +1,60 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO cpputest/cpputest
|
6 |
+
REF 4699da9942a1bdcc33e2a8c8a48e863b0f18188e
|
7 |
+
SHA512 6f588691f1b4092b3be8167ab09f3a4a64c34715ac9397210724121d161024a43b12a88198b02b0cc8da7d72406670daaf375bb64cc4cf92c8bd2479e7a881bc
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
fix-arm-build-error.patch
|
11 |
+
)
|
12 |
+
|
13 |
+
vcpkg_configure_cmake(
|
14 |
+
SOURCE_PATH ${SOURCE_PATH}
|
15 |
+
PREFER_NINJA
|
16 |
+
)
|
17 |
+
|
18 |
+
vcpkg_install_cmake()
|
19 |
+
|
20 |
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/CppUTest/cmake TARGET_PATH share/CppUTest)
|
21 |
+
if (EXISTS ${CURRENT_PACKAGES_DIR}/lib/CppUTest)
|
22 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/CppUTest)
|
23 |
+
endif()
|
24 |
+
|
25 |
+
if (EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/CppUTest)
|
26 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/CppUTest)
|
27 |
+
endif()
|
28 |
+
|
29 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
|
30 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link)
|
31 |
+
file(GLOB CPPUTEST_LIBS ${CURRENT_PACKAGES_DIR}/lib/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX})
|
32 |
+
file(COPY ${CPPUTEST_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link)
|
33 |
+
file(REMOVE ${CPPUTEST_LIBS})
|
34 |
+
|
35 |
+
file(READ ${CURRENT_PACKAGES_DIR}/share/CppUTest/CppUTestTargets-release.cmake RELEASE_CONFIG)
|
36 |
+
# Replace CppUTestExt first
|
37 |
+
string(REPLACE "\${_IMPORT_PREFIX}/lib/"
|
38 |
+
"\${_IMPORT_PREFIX}/lib/manual-link/" RELEASE_CONFIG "${RELEASE_CONFIG}")
|
39 |
+
file(WRITE ${CURRENT_PACKAGES_DIR}/share/CppUTest/CppUTestTargets-release.cmake "${RELEASE_CONFIG}")
|
40 |
+
endif()
|
41 |
+
|
42 |
+
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
|
43 |
+
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
|
44 |
+
file(GLOB CPPUTEST_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX})
|
45 |
+
file(COPY ${CPPUTEST_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
|
46 |
+
file(REMOVE ${CPPUTEST_LIBS})
|
47 |
+
|
48 |
+
file(READ ${CURRENT_PACKAGES_DIR}/share/CppUTest/CppUTestTargets-debug.cmake DEBUG_CONFIG)
|
49 |
+
# Replace CppUTestExt first
|
50 |
+
string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/"
|
51 |
+
"\${_IMPORT_PREFIX}/debug/lib/manual-link/" DEBUG_CONFIG "${DEBUG_CONFIG}")
|
52 |
+
file(WRITE ${CURRENT_PACKAGES_DIR}/share/CppUTest/CppUTestTargets-debug.cmake "${DEBUG_CONFIG}")
|
53 |
+
endif()
|
54 |
+
|
55 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
56 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
57 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
|
58 |
+
|
59 |
+
# Handle copyright
|
60 |
+
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpputest/vcpkg.json
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cpputest",
|
3 |
+
"version-string": "2019-9-16",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "CppUTest unit testing and mocking framework for C/C++.",
|
6 |
+
"homepage": "https://github.com/cpputest/cpputest"
|
7 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppwinrt/portfile.cmake
ADDED
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
find_path(CPPWINRT_BASE_H
|
2 |
+
NAMES winrt/base.h
|
3 |
+
PATHS $ENV{INCLUDE}
|
4 |
+
)
|
5 |
+
|
6 |
+
if(NOT CPPWINRT_BASE_H)
|
7 |
+
message(FATAL_ERROR "Unable to locate cppwinrt. Please install Windows SDK version 10.0.17134.0 or newer.")
|
8 |
+
endif()
|
9 |
+
|
10 |
+
SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppwinrt/vcpkg.json
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cppwinrt",
|
3 |
+
"version-string": "windows-sdk",
|
4 |
+
"description": "C++/WinRT is a standard C++ language projection for the Windows Runtime.",
|
5 |
+
"homepage": "https://github.com/Microsoft/cppwinrt",
|
6 |
+
"supports": "windows"
|
7 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppxaml/portfile.cmake
ADDED
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
#header-only library
|
2 |
+
vcpkg_from_github(
|
3 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
4 |
+
REPO asklar/xaml-islands
|
5 |
+
REF 0.0.16
|
6 |
+
SHA512 30fba1ef9264bf2eeaf0e48898c6b138adef9ee98d758ac91bcc7f2c90e50f00ec35925705347c3fc5c84b97652caeece7b3854be5b468a02e51fed23eda8007
|
7 |
+
HEAD_REF main
|
8 |
+
)
|
9 |
+
|
10 |
+
file(INSTALL "${SOURCE_PATH}/inc/cppxaml" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
|
11 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppxaml/vcpkg.json
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cppxaml",
|
3 |
+
"version": "0.0.16",
|
4 |
+
"description": "CppXaml is a library to facilitate usage of the XAML UI framework in C++ Windows apps.",
|
5 |
+
"homepage": "https://asklar.github.io/xaml-islands",
|
6 |
+
"supports": "windows"
|
7 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppzmq/portfile.cmake
ADDED
@@ -0,0 +1,27 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO zeromq/cppzmq
|
4 |
+
REF v4.8.1
|
5 |
+
SHA512 02F9B77F67DD46557705511195EB3F4F4E52381256BC9687F36D3E69DB6A628C19CFFF02209B6E6B53822A60781AB0850EB064D8F020E059FC1ACA4D191B66DB
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
10 |
+
FEATURES
|
11 |
+
draft ENABLE_DRAFTS
|
12 |
+
)
|
13 |
+
|
14 |
+
vcpkg_cmake_configure(
|
15 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
16 |
+
OPTIONS ${FEATURE_OPTIONS}
|
17 |
+
-DCPPZMQ_BUILD_TESTS=OFF
|
18 |
+
)
|
19 |
+
|
20 |
+
vcpkg_cmake_install()
|
21 |
+
|
22 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/cppzmq)
|
23 |
+
|
24 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/${PORT}/libzmq-pkg-config")
|
25 |
+
|
26 |
+
# Handle copyright
|
27 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cppzmq/vcpkg.json
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cppzmq",
|
3 |
+
"version": "4.8.1",
|
4 |
+
"description": "lightweight messaging kernel, C++ bindings",
|
5 |
+
"homepage": "https://github.com/zeromq/cppzmq",
|
6 |
+
"dependencies": [
|
7 |
+
{
|
8 |
+
"name": "vcpkg-cmake",
|
9 |
+
"host": true
|
10 |
+
},
|
11 |
+
{
|
12 |
+
"name": "vcpkg-cmake-config",
|
13 |
+
"host": true
|
14 |
+
},
|
15 |
+
"zeromq"
|
16 |
+
],
|
17 |
+
"features": {
|
18 |
+
"draft": {
|
19 |
+
"description": "Build and install draft"
|
20 |
+
}
|
21 |
+
}
|
22 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpr/001-cpr-config.patch
ADDED
@@ -0,0 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt
|
2 |
+
index 66fc9eb..cc00c72 100644
|
3 |
+
--- a/cpr/CMakeLists.txt
|
4 |
+
+++ b/cpr/CMakeLists.txt
|
5 |
+
@@ -30,6 +30,10 @@ set_target_properties(cpr
|
6 |
+
VERSION ${${PROJECT_NAME}_VERSION}
|
7 |
+
SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR})
|
8 |
+
|
9 |
+
+if (NOT DISABLE_INSTALL_HEADERS)
|
10 |
+
+ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include)
|
11 |
+
+endif()
|
12 |
+
+
|
13 |
+
# Import GNU common install directory variables
|
14 |
+
include(GNUInstallDirs)
|
15 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpr/portfile.cmake
ADDED
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO libcpr/cpr
|
6 |
+
REF 1.8.1
|
7 |
+
SHA512 f586b63ddbd9bd03e5c5aa385aad0d4f16f79847e1a14f6dc8a5e0cad4ed89e097ab83484c9ed19e034abf0d2eece13a7609652bc6a1a9caba43189cf0a782db
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
001-cpr-config.patch
|
11 |
+
)
|
12 |
+
|
13 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
14 |
+
FEATURES
|
15 |
+
ssl CPR_ENABLE_SSL
|
16 |
+
)
|
17 |
+
|
18 |
+
vcpkg_cmake_configure(
|
19 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
20 |
+
OPTIONS
|
21 |
+
-DCPR_BUILD_TESTS=OFF
|
22 |
+
-DCPR_FORCE_USE_SYSTEM_CURL=ON
|
23 |
+
${FEATURE_OPTIONS}
|
24 |
+
OPTIONS_DEBUG
|
25 |
+
-DDISABLE_INSTALL_HEADERS=ON
|
26 |
+
)
|
27 |
+
|
28 |
+
vcpkg_cmake_install()
|
29 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpr)
|
30 |
+
|
31 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
32 |
+
|
33 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpr/vcpkg.json
ADDED
@@ -0,0 +1,42 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cpr",
|
3 |
+
"version-semver": "1.8.1",
|
4 |
+
"description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.",
|
5 |
+
"homepage": "https://github.com/libcpr/cpr",
|
6 |
+
"license": "MIT",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "curl",
|
10 |
+
"default-features": false
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake",
|
14 |
+
"host": true
|
15 |
+
},
|
16 |
+
{
|
17 |
+
"name": "vcpkg-cmake-config",
|
18 |
+
"host": true
|
19 |
+
}
|
20 |
+
],
|
21 |
+
"default-features": [
|
22 |
+
"ssl"
|
23 |
+
],
|
24 |
+
"features": {
|
25 |
+
"ssl": {
|
26 |
+
"description": "Enable SSL support",
|
27 |
+
"dependencies": [
|
28 |
+
{
|
29 |
+
"name": "curl",
|
30 |
+
"default-features": false,
|
31 |
+
"features": [
|
32 |
+
"ssl"
|
33 |
+
]
|
34 |
+
},
|
35 |
+
{
|
36 |
+
"name": "openssl",
|
37 |
+
"platform": "linux"
|
38 |
+
}
|
39 |
+
]
|
40 |
+
}
|
41 |
+
}
|
42 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpu-features/make_list_cpu_features_optional.patch
ADDED
@@ -0,0 +1,70 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 68ece3bba0d79ab721a0c50ee1e6014a37f759dc Mon Sep 17 00:00:00 2001
|
2 |
+
From: Wei Dai <[email protected]>
|
3 |
+
Date: Mon, 24 May 2021 10:02:07 -0700
|
4 |
+
Subject: [PATCH] Added an option to disable the executable target
|
5 |
+
list_cpu_feature.
|
6 |
+
|
7 |
+
---
|
8 |
+
CMakeLists.txt | 23 ++++++++++++++++++-----
|
9 |
+
1 file changed, 18 insertions(+), 5 deletions(-)
|
10 |
+
|
11 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
12 |
+
index f9daeac..48eea0e 100644
|
13 |
+
--- a/CMakeLists.txt
|
14 |
+
+++ b/CMakeLists.txt
|
15 |
+
@@ -17,6 +17,8 @@ if(NOT CMAKE_BUILD_TYPE)
|
16 |
+
FORCE)
|
17 |
+
endif(NOT CMAKE_BUILD_TYPE)
|
18 |
+
|
19 |
+
+# An option to disable the executable target list_cpu_features.
|
20 |
+
+option(BUILD_EXECUTABLE "Build list_cpu_features executable." ON)
|
21 |
+
# BUILD_TESTING is a standard CMake variable, but we declare it here to make it
|
22 |
+
# prominent in the GUI.
|
23 |
+
option(BUILD_TESTING "Enable test (depends on googletest)." OFF)
|
24 |
+
@@ -157,9 +159,11 @@ add_library(CpuFeature::cpu_features ALIAS cpu_features)
|
25 |
+
# program : list_cpu_features
|
26 |
+
#
|
27 |
+
|
28 |
+
-add_executable(list_cpu_features ${PROJECT_SOURCE_DIR}/src/utils/list_cpu_features.c)
|
29 |
+
-target_link_libraries(list_cpu_features PRIVATE cpu_features)
|
30 |
+
-add_executable(CpuFeature::list_cpu_features ALIAS list_cpu_features)
|
31 |
+
+if(BUILD_EXECUTABLE)
|
32 |
+
+ add_executable(list_cpu_features ${PROJECT_SOURCE_DIR}/src/utils/list_cpu_features.c)
|
33 |
+
+ target_link_libraries(list_cpu_features PRIVATE cpu_features)
|
34 |
+
+ add_executable(CpuFeature::list_cpu_features ALIAS list_cpu_features)
|
35 |
+
+endif()
|
36 |
+
|
37 |
+
#
|
38 |
+
# ndk_compat
|
39 |
+
@@ -223,17 +227,26 @@ if(BUILD_TESTING)
|
40 |
+
endif()
|
41 |
+
|
42 |
+
#
|
43 |
+
-# Install cpu_features and list_cpu_features
|
44 |
+
+# Install cpu_features and optionally list_cpu_features
|
45 |
+
#
|
46 |
+
|
47 |
+
include(GNUInstallDirs)
|
48 |
+
-install(TARGETS cpu_features list_cpu_features
|
49 |
+
+install(TARGETS cpu_features
|
50 |
+
EXPORT CpuFeaturesTargets
|
51 |
+
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cpu_features
|
52 |
+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
53 |
+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
54 |
+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
55 |
+
)
|
56 |
+
+if(BUILD_EXECUTABLE)
|
57 |
+
+ install(TARGETS list_cpu_features
|
58 |
+
+ EXPORT CpuFeaturesTargets
|
59 |
+
+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cpu_features
|
60 |
+
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
61 |
+
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
62 |
+
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
63 |
+
+ )
|
64 |
+
+endif()
|
65 |
+
install(EXPORT CpuFeaturesTargets
|
66 |
+
NAMESPACE CpuFeatures::
|
67 |
+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/CpuFeatures
|
68 |
+
--
|
69 |
+
2.25.1
|
70 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpu-features/portfile.cmake
ADDED
@@ -0,0 +1,35 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO google/cpu_features
|
6 |
+
REF a8397ba4591237c17d18e4acc091f5f3ebe7391e # 0.6.0
|
7 |
+
SHA512 71a583e8190699d6df3dfa2857886089265cdfbcb916d9828a3611a1d6d23487464d6448b900b49637f015dd7d4e18bb206e0249af0932928f8ced13a081d42b
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES make_list_cpu_features_optional.patch
|
10 |
+
)
|
11 |
+
|
12 |
+
# If feature "tools" is not specified, disable building/exporting executable targets.
|
13 |
+
# This is necessary so that downstream find_package(CpuFeatures) does not fail.
|
14 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
15 |
+
FEATURES
|
16 |
+
tools BUILD_EXECUTABLE
|
17 |
+
)
|
18 |
+
|
19 |
+
vcpkg_cmake_configure(
|
20 |
+
SOURCE_PATH ${SOURCE_PATH}
|
21 |
+
OPTIONS
|
22 |
+
${FEATURE_OPTIONS}
|
23 |
+
)
|
24 |
+
|
25 |
+
vcpkg_cmake_install()
|
26 |
+
|
27 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME "CpuFeatures" CONFIG_PATH "lib/cmake/CpuFeatures")
|
28 |
+
|
29 |
+
if("tools" IN_LIST FEATURES)
|
30 |
+
vcpkg_copy_tools(TOOL_NAMES "list_cpu_features" AUTO_CLEAN)
|
31 |
+
endif()
|
32 |
+
|
33 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
34 |
+
|
35 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpu-features/vcpkg.json
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cpu-features",
|
3 |
+
"version": "0.6.0",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "A cross-platform C library to retrieve CPU features (such as available instructions) at runtime",
|
6 |
+
"homepage": "https://github.com/google/cpu_features",
|
7 |
+
"license": "Apache-2.0",
|
8 |
+
"supports": "!(arm | uwp)",
|
9 |
+
"dependencies": [
|
10 |
+
{
|
11 |
+
"name": "vcpkg-cmake",
|
12 |
+
"host": true
|
13 |
+
},
|
14 |
+
{
|
15 |
+
"name": "vcpkg-cmake-config",
|
16 |
+
"host": true
|
17 |
+
}
|
18 |
+
],
|
19 |
+
"features": {
|
20 |
+
"tools": {
|
21 |
+
"description": "list_cpu_features command line tool"
|
22 |
+
}
|
23 |
+
}
|
24 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpuid/portfile.cmake
ADDED
@@ -0,0 +1,27 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO anrieff/libcpuid
|
6 |
+
REF 179fbcb713566c2084a1903729b6eebba68a4424 #0.5.1
|
7 |
+
SHA512 76eef8147a9ed2f116ddfd07ab95f76126bee0e23d0e6b5be54d157a1456b769fb698a4799a43c5f81ac12368d76fe8904bff735a698342ad8ee41d43e72645b
|
8 |
+
HEAD_REF master
|
9 |
+
)
|
10 |
+
|
11 |
+
vcpkg_cmake_configure(
|
12 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
13 |
+
OPTIONS
|
14 |
+
-DENABLE_DOCS=OFF
|
15 |
+
)
|
16 |
+
|
17 |
+
vcpkg_cmake_install()
|
18 |
+
|
19 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpuid)
|
20 |
+
|
21 |
+
vcpkg_copy_pdbs()
|
22 |
+
|
23 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include")
|
24 |
+
|
25 |
+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
26 |
+
|
27 |
+
vcpkg_fixup_pkgconfig()
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpuid/vcpkg.json
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cpuid",
|
3 |
+
"version": "0.5.1",
|
4 |
+
"port-version": 3,
|
5 |
+
"description": "Provides CPU identification for the x86 (and x86_64)",
|
6 |
+
"homepage": "https://github.com/anrieff/libcpuid",
|
7 |
+
"supports": "(x86 | x64) & !uwp",
|
8 |
+
"dependencies": [
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true
|
12 |
+
},
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake-config",
|
15 |
+
"host": true
|
16 |
+
}
|
17 |
+
]
|
18 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpuinfo/portfile.cmake
ADDED
@@ -0,0 +1,76 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# On Windows, we can get a cpuinfo.dll, but it exports no symbols.
|
2 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
3 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
4 |
+
endif()
|
5 |
+
|
6 |
+
vcpkg_from_github(
|
7 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
8 |
+
REPO pytorch/cpuinfo
|
9 |
+
REF b40bae27785787b6dd70788986fd96434cf90ae2
|
10 |
+
SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c
|
11 |
+
HEAD_REF master
|
12 |
+
)
|
13 |
+
|
14 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
15 |
+
FEATURES
|
16 |
+
tools CPUINFO_BUILD_TOOLS
|
17 |
+
)
|
18 |
+
|
19 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
20 |
+
list(APPEND LINK_OPTIONS -DCPUINFO_LIBRARY_TYPE=shared)
|
21 |
+
else()
|
22 |
+
list(APPEND LINK_OPTIONS -DCPUINFO_LIBRARY_TYPE=static)
|
23 |
+
endif()
|
24 |
+
|
25 |
+
if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
|
26 |
+
list(APPEND LINK_OPTIONS -DCPUINFO_RUNTIME_TYPE=shared)
|
27 |
+
else()
|
28 |
+
list(APPEND LINK_OPTIONS -DCPUINFO_RUNTIME_TYPE=static)
|
29 |
+
endif()
|
30 |
+
|
31 |
+
# hack to get around that toolchains/windows.cmake doesn't set CMAKE_SYSTEM_ARCHITECTURE
|
32 |
+
set(CPUINFO_TARGET_PROCESSOR_param "")
|
33 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
34 |
+
# NOTE: arm64-windows is unsupported for now;
|
35 |
+
# see https://github.com/pytorch/cpuinfo/pull/82 for updates
|
36 |
+
# NOTE: arm-windows is unsupported
|
37 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
38 |
+
set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=x86")
|
39 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
40 |
+
set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=AMD64")
|
41 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
42 |
+
set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=ARM")
|
43 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
44 |
+
set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=ARM64")
|
45 |
+
endif()
|
46 |
+
endif()
|
47 |
+
|
48 |
+
vcpkg_cmake_configure(
|
49 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
50 |
+
OPTIONS
|
51 |
+
${FEATURE_OPTIONS}
|
52 |
+
${LINK_OPTIONS}
|
53 |
+
${CPUINFO_TARGET_PROCESSOR_param}
|
54 |
+
-DCPUINFO_BUILD_UNIT_TESTS=OFF
|
55 |
+
-DCPUINFO_BUILD_MOCK_TESTS=OFF
|
56 |
+
-DCPUINFO_BUILD_BENCHMARKS=OFF
|
57 |
+
OPTIONS_DEBUG
|
58 |
+
-DCPUINFO_LOG_LEVEL=debug
|
59 |
+
OPTIONS_RELEASE
|
60 |
+
-DCPUINFO_LOG_LEVEL=default
|
61 |
+
)
|
62 |
+
vcpkg_cmake_install()
|
63 |
+
vcpkg_cmake_config_fixup()
|
64 |
+
vcpkg_copy_pdbs()
|
65 |
+
vcpkg_fixup_pkgconfig() # pkg_check_modules(libcpuinfo)
|
66 |
+
|
67 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
68 |
+
|
69 |
+
if("tools" IN_LIST FEATURES)
|
70 |
+
vcpkg_copy_tools(
|
71 |
+
TOOL_NAMES cache-info cpuid-dump cpu-info isa-info
|
72 |
+
AUTO_CLEAN
|
73 |
+
)
|
74 |
+
endif()
|
75 |
+
|
76 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cpuinfo/vcpkg.json
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cpuinfo",
|
3 |
+
"version-date": "2022-04-02",
|
4 |
+
"description": "CPU INFOrmation library (x86/x86-64/ARM/ARM64, Linux/Windows/Android/macOS/iOS)",
|
5 |
+
"homepage": "https://github.com/pytorch/cpuinfo",
|
6 |
+
"license": "BSD-2-Clause",
|
7 |
+
"supports": "!(arm & windows)",
|
8 |
+
"dependencies": [
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true
|
12 |
+
},
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake-config",
|
15 |
+
"host": true
|
16 |
+
}
|
17 |
+
],
|
18 |
+
"features": {
|
19 |
+
"tools": {
|
20 |
+
"description": "Build cpuinfo command-line tools"
|
21 |
+
}
|
22 |
+
}
|
23 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cr/portfile.cmake
ADDED
@@ -0,0 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO fungos/cr
|
4 |
+
REF 66b76e24611c3b87566e5365e8c422387bc85916
|
5 |
+
SHA512 002162461ecf131d717f7567cf13ee1345b7b359bb17c0801f4246c472c1b180f4f8937e9a3f4c186d95c41c20ffcc5ba5e953f197f344fb1000f51d8c4ee473
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
file(
|
10 |
+
COPY ${SOURCE_PATH}/cr.h
|
11 |
+
DESTINATION ${CURRENT_PACKAGES_DIR}/include
|
12 |
+
)
|
13 |
+
|
14 |
+
# Handle copyright
|
15 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/cr/vcpkg.json
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "cr",
|
3 |
+
"version-string": "2020-04-26",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "cr.h: A Simple C Hot Reload Header-only Library",
|
6 |
+
"homepage": "https://fungos.github.io/cr-simple-c-hot-reload/"
|
7 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashpad/crashpadConfig.cmake.in
ADDED
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# Compute the installation prefix relative to this file.
|
2 |
+
get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
3 |
+
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
4 |
+
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
|
5 |
+
if(_IMPORT_PREFIX STREQUAL "/")
|
6 |
+
set(_IMPORT_PREFIX "")
|
7 |
+
endif()
|
8 |
+
|
9 |
+
add_library(crashpad INTERFACE)
|
10 |
+
add_library(crashpad::crashpad ALIAS crashpad)
|
11 |
+
|
12 |
+
set(CRASHPAD_LIBRARIES client util base)
|
13 |
+
|
14 |
+
if(WIN32)
|
15 |
+
target_compile_definitions(crashpad INTERFACE NOMINMAX)
|
16 |
+
elseif(APPLE)
|
17 |
+
list(APPEND CRASHPAD_LIBRARIES ApplicationServices
|
18 |
+
CoreFoundation Foundation IOKit Security bsm)
|
19 |
+
endif()
|
20 |
+
|
21 |
+
foreach(LIB_NAME ${CRASHPAD_LIBRARIES})
|
22 |
+
find_library(_LIB ${LIB_NAME})
|
23 |
+
target_link_libraries(crashpad INTERFACE ${_LIB})
|
24 |
+
unset(_LIB CACHE)
|
25 |
+
endforeach()
|
26 |
+
|
27 |
+
find_package(ZLIB REQUIRED)
|
28 |
+
target_link_libraries(crashpad INTERFACE ZLIB::ZLIB)
|
29 |
+
|
30 |
+
target_include_directories(crashpad
|
31 |
+
INTERFACE ${_IMPORT_PREFIX}/include/crashpad)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashpad/portfile.cmake
ADDED
@@ -0,0 +1,125 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_git(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
URL https://chromium.googlesource.com/crashpad/crashpad
|
6 |
+
REF 9a31d3f8e9815774026a753a1ff6155347cd549f
|
7 |
+
)
|
8 |
+
|
9 |
+
function(checkout_in_path PATH URL REF)
|
10 |
+
if(EXISTS "${PATH}")
|
11 |
+
return()
|
12 |
+
endif()
|
13 |
+
|
14 |
+
vcpkg_from_git(
|
15 |
+
OUT_SOURCE_PATH DEP_SOURCE_PATH
|
16 |
+
URL "${URL}"
|
17 |
+
REF "${REF}"
|
18 |
+
)
|
19 |
+
file(RENAME "${DEP_SOURCE_PATH}" "${PATH}")
|
20 |
+
file(REMOVE_RECURSE "${DEP_SOURCE_PATH}")
|
21 |
+
endfunction()
|
22 |
+
|
23 |
+
# mini_chromium contains the toolchains and build configuration
|
24 |
+
checkout_in_path(
|
25 |
+
"${SOURCE_PATH}/third_party/mini_chromium/mini_chromium"
|
26 |
+
"https://chromium.googlesource.com/chromium/mini_chromium"
|
27 |
+
"c426ff98e1d9e9d59777fe8b883a5c0ceeca9ca3"
|
28 |
+
)
|
29 |
+
|
30 |
+
function(replace_gn_dependency INPUT_FILE OUTPUT_FILE LIBRARY_NAMES)
|
31 |
+
unset(_LIBRARY_DEB CACHE)
|
32 |
+
find_library(_LIBRARY_DEB NAMES ${LIBRARY_NAMES}
|
33 |
+
PATHS "${CURRENT_INSTALLED_DIR}/debug/lib"
|
34 |
+
NO_DEFAULT_PATH)
|
35 |
+
|
36 |
+
if(_LIBRARY_DEB MATCHES "-NOTFOUND")
|
37 |
+
message(FATAL_ERROR "Could not find debug library with names: ${LIBRARY_NAMES}")
|
38 |
+
endif()
|
39 |
+
|
40 |
+
unset(_LIBRARY_REL CACHE)
|
41 |
+
find_library(_LIBRARY_REL NAMES ${LIBRARY_NAMES}
|
42 |
+
PATHS "${CURRENT_INSTALLED_DIR}/lib"
|
43 |
+
NO_DEFAULT_PATH)
|
44 |
+
|
45 |
+
if(_LIBRARY_REL MATCHES "-NOTFOUND")
|
46 |
+
message(FATAL_ERROR "Could not find library with names: ${LIBRARY_NAMES}")
|
47 |
+
endif()
|
48 |
+
|
49 |
+
set(_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include")
|
50 |
+
|
51 |
+
file(REMOVE "${OUTPUT_FILE}")
|
52 |
+
configure_file("${INPUT_FILE}" "${OUTPUT_FILE}" @ONLY)
|
53 |
+
endfunction()
|
54 |
+
|
55 |
+
replace_gn_dependency(
|
56 |
+
"${CMAKE_CURRENT_LIST_DIR}/zlib.gn"
|
57 |
+
"${SOURCE_PATH}/third_party/zlib/BUILD.gn"
|
58 |
+
"z;zlib;zlibd"
|
59 |
+
)
|
60 |
+
|
61 |
+
set(OPTIONS_DBG "is_debug=true")
|
62 |
+
set(OPTIONS_REL "")
|
63 |
+
|
64 |
+
if(CMAKE_HOST_WIN32)
|
65 |
+
# Load toolchains
|
66 |
+
if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
|
67 |
+
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake")
|
68 |
+
endif()
|
69 |
+
include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")
|
70 |
+
|
71 |
+
foreach(_VAR CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS
|
72 |
+
CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE)
|
73 |
+
string(STRIP "${${_VAR}}" ${_VAR})
|
74 |
+
endforeach()
|
75 |
+
|
76 |
+
set(OPTIONS_DBG "${OPTIONS_DBG} \
|
77 |
+
extra_cflags_c=\"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}\" \
|
78 |
+
extra_cflags_cc=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}\"")
|
79 |
+
|
80 |
+
set(OPTIONS_REL "${OPTIONS_REL} \
|
81 |
+
extra_cflags_c=\"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}\" \
|
82 |
+
extra_cflags_cc=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}\"")
|
83 |
+
|
84 |
+
set(DISABLE_WHOLE_PROGRAM_OPTIMIZATION "\
|
85 |
+
extra_cflags=\"/GL-\" \
|
86 |
+
extra_ldflags=\"/LTCG:OFF\" \
|
87 |
+
extra_arflags=\"/LTCG:OFF\"")
|
88 |
+
|
89 |
+
set(OPTIONS_DBG "${OPTIONS_DBG} ${DISABLE_WHOLE_PROGRAM_OPTIMIZATION}")
|
90 |
+
set(OPTIONS_REL "${OPTIONS_REL} ${DISABLE_WHOLE_PROGRAM_OPTIMIZATION}")
|
91 |
+
endif()
|
92 |
+
|
93 |
+
vcpkg_configure_gn(
|
94 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
95 |
+
OPTIONS_DEBUG "${OPTIONS_DBG}"
|
96 |
+
OPTIONS_RELEASE "${OPTIONS_REL}"
|
97 |
+
)
|
98 |
+
|
99 |
+
vcpkg_install_gn(
|
100 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
101 |
+
TARGETS client util third_party/mini_chromium/mini_chromium/base handler:crashpad_handler
|
102 |
+
)
|
103 |
+
|
104 |
+
message(STATUS "Installing headers...")
|
105 |
+
set(PACKAGES_INCLUDE_DIR "${CURRENT_PACKAGES_DIR}/include/${PORT}")
|
106 |
+
function(install_headers DIR)
|
107 |
+
file(COPY "${DIR}" DESTINATION "${PACKAGES_INCLUDE_DIR}" FILES_MATCHING PATTERN "*.h")
|
108 |
+
endfunction()
|
109 |
+
install_headers("${SOURCE_PATH}/client")
|
110 |
+
install_headers("${SOURCE_PATH}/util")
|
111 |
+
install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/base")
|
112 |
+
install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build")
|
113 |
+
|
114 |
+
# remove empty directories
|
115 |
+
file(REMOVE_RECURSE
|
116 |
+
"${PACKAGES_INCLUDE_DIR}/util/net/testdata"
|
117 |
+
"${PACKAGES_INCLUDE_DIR}/build/ios")
|
118 |
+
|
119 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/crashpadConfig.cmake.in"
|
120 |
+
"${CURRENT_PACKAGES_DIR}/share/${PORT}/crashpadConfig.cmake" @ONLY)
|
121 |
+
|
122 |
+
vcpkg_copy_pdbs()
|
123 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE"
|
124 |
+
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
|
125 |
+
RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashpad/vcpkg.json
ADDED
@@ -0,0 +1,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "crashpad",
|
3 |
+
"version-date": "2020-03-18",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": [
|
6 |
+
"Crashpad is a crash-reporting system.",
|
7 |
+
"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."
|
8 |
+
],
|
9 |
+
"homepage": "https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md",
|
10 |
+
"supports": "x64 & (osx | windows)",
|
11 |
+
"dependencies": [
|
12 |
+
"zlib"
|
13 |
+
]
|
14 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashpad/zlib.gn
ADDED
@@ -0,0 +1,15 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
import("../../build/crashpad_buildconfig.gni")
|
2 |
+
|
3 |
+
config("zlib_config") {
|
4 |
+
defines = [ "CRASHPAD_ZLIB_SOURCE_EXTERNAL" ]
|
5 |
+
include_dirs = [ "@_INCLUDE_DIR@" ]
|
6 |
+
}
|
7 |
+
|
8 |
+
source_set("zlib") {
|
9 |
+
public_configs = [ ":zlib_config" ]
|
10 |
+
if(is_debug) {
|
11 |
+
libs = [ "@_LIBRARY_DEB@" ]
|
12 |
+
} else {
|
13 |
+
libs = [ "@_LIBRARY_REL@" ]
|
14 |
+
}
|
15 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashrpt/001-add-install-target-and-find-deps.patch
ADDED
@@ -0,0 +1,809 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 44d7df0..ed9e3d3 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -17,6 +17,9 @@ set (CRASHRPT_VER 1403)
|
6 |
+
# Build options
|
7 |
+
option(CRASHRPT_BUILD_SHARED_LIBS "If set (default), CrashRpt modules are built as dynamic-link libraries, otherwise as static libs." ON)
|
8 |
+
option(CRASHRPT_LINK_CRT_AS_DLL "If set (default), CrashRpt modules link C run-time (CRT) as multi-threaded dynamic libraries, otherwise as multi-threaded static libs." ON)
|
9 |
+
+option(CRASHRPT_BUILD_PROBE "If set (default), CrashRpt builds the CrashRptProbe project." ON)
|
10 |
+
+option(CRASHRPT_BUILD_DEMOS "If set (default), CrashRpt builds the demo projects." ON)
|
11 |
+
+option(CRASHRPT_BUILD_TESTS "If set (default), CrashRpt builds the test projects." ON)
|
12 |
+
|
13 |
+
# Set output directory for executable files
|
14 |
+
if(CMAKE_CL_64)
|
15 |
+
@@ -94,19 +97,65 @@ macro(fix_default_compiler_settings_)
|
16 |
+
|
17 |
+
endmacro()
|
18 |
+
|
19 |
+
+find_package(ZLIB REQUIRED)
|
20 |
+
+find_package(PNG REQUIRED)
|
21 |
+
+find_package(Ogg REQUIRED)
|
22 |
+
+find_package(JPEG REQUIRED)
|
23 |
+
+
|
24 |
+
+find_library(THEORA_LIBRARY theora)
|
25 |
+
+if(NOT THEORA_LIBRARY)
|
26 |
+
+ message(FATAL_ERROR "theora library not found")
|
27 |
+
+endif()
|
28 |
+
+
|
29 |
+
+find_path(THEORA_INCLUDE_DIR theora/theora.h)
|
30 |
+
+if(NOT THEORA_INCLUDE_DIR)
|
31 |
+
+ message(FATAL_ERROR "theora include dir not found")
|
32 |
+
+endif()
|
33 |
+
+
|
34 |
+
+find_library(TINYXML_LIBRARY NAMES tinyxml)
|
35 |
+
+if(NOT TINYXML_LIBRARY)
|
36 |
+
+ message(FATAL_ERROR "tinyxml library not found")
|
37 |
+
+endif()
|
38 |
+
+
|
39 |
+
+find_path(TINYXML_INCLUDE_DIR tinyxml.h)
|
40 |
+
+if(NOT TINYXML_INCLUDE_DIR)
|
41 |
+
+ message(FATAL_ERROR "tinyxml include dir not found")
|
42 |
+
+endif()
|
43 |
+
+
|
44 |
+
+find_path(WTL_INCLUDE_DIR wtl/atlapp.h)
|
45 |
+
+if(NOT WTL_INCLUDE_DIR)
|
46 |
+
+ message(FATAL_ERROR "WTL include dir not found")
|
47 |
+
+endif()
|
48 |
+
+
|
49 |
+
+find_library(DBGHELP_LIBRARY dbghelp)
|
50 |
+
+if(NOT DBGHELP_LIBRARY)
|
51 |
+
+ message(FATAL_ERROR "dbghelp library not found")
|
52 |
+
+endif()
|
53 |
+
+
|
54 |
+
+find_path(DBGHELP_INCLUDE_DIR dbghelp.h)
|
55 |
+
+if(NOT DBGHELP_INCLUDE_DIR)
|
56 |
+
+ message(FATAL_ERROR "dbghelp include dir not found")
|
57 |
+
+endif()
|
58 |
+
+
|
59 |
+
# Other CMakeLists are located in project subdirectories
|
60 |
+
|
61 |
+
+if(CRASHRPT_BUILD_DEMOS)
|
62 |
+
add_subdirectory("demos/ConsoleDemo")
|
63 |
+
add_subdirectory("demos/WTLDemo")
|
64 |
+
add_subdirectory("demos/MFCDemo")
|
65 |
+
+endif()
|
66 |
+
|
67 |
+
add_subdirectory("reporting/crashrpt")
|
68 |
+
add_subdirectory("reporting/crashsender")
|
69 |
+
|
70 |
+
+if(CRASHRPT_BUILD_PROBE)
|
71 |
+
add_subdirectory("processing/crashrptprobe")
|
72 |
+
add_subdirectory("processing/crprober")
|
73 |
+
+endif()
|
74 |
+
|
75 |
+
+if(CRASHRPT_BUILD_TESTS)
|
76 |
+
add_subdirectory("tests")
|
77 |
+
+endif()
|
78 |
+
|
79 |
+
# Set output directory for LIB files
|
80 |
+
if(CMAKE_CL_64)
|
81 |
+
@@ -117,13 +166,13 @@ else(CMAKE_CL_64)
|
82 |
+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/thirdparty/lib)
|
83 |
+
endif(CMAKE_CL_64)
|
84 |
+
|
85 |
+
-add_subdirectory("thirdparty/tinyxml")
|
86 |
+
-add_subdirectory("thirdparty/jpeg")
|
87 |
+
-add_subdirectory("thirdparty/libpng")
|
88 |
+
+#add_subdirectory("thirdparty/tinyxml")
|
89 |
+
+#add_subdirectory("thirdparty/jpeg")
|
90 |
+
+#add_subdirectory("thirdparty/libpng")
|
91 |
+
add_subdirectory("thirdparty/minizip")
|
92 |
+
-add_subdirectory("thirdparty/zlib")
|
93 |
+
-add_subdirectory("thirdparty/libogg")
|
94 |
+
-add_subdirectory("thirdparty/libtheora")
|
95 |
+
+#add_subdirectory("thirdparty/zlib")
|
96 |
+
+#add_subdirectory("thirdparty/libogg")
|
97 |
+
+#add_subdirectory("thirdparty/libtheora")
|
98 |
+
|
99 |
+
|
100 |
+
|
101 |
+
diff --git a/demos/ConsoleDemo/CMakeLists.txt b/demos/ConsoleDemo/CMakeLists.txt
|
102 |
+
index e47ef4c..4df7b12 100644
|
103 |
+
--- a/demos/ConsoleDemo/CMakeLists.txt
|
104 |
+
+++ b/demos/ConsoleDemo/CMakeLists.txt
|
105 |
+
@@ -12,12 +12,12 @@ fix_default_compiler_settings_()
|
106 |
+
# Add include dir
|
107 |
+
include_directories(${CMAKE_SOURCE_DIR}/include
|
108 |
+
${CMAKE_SOURCE_DIR}/reporting/CrashRpt
|
109 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/wtl
|
110 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/zlib
|
111 |
+
+ ${WTL_INCLUDE_DIR}
|
112 |
+
+ ${ZLIB_INCLUDE_DIRS}
|
113 |
+
${CMAKE_SOURCE_DIR}/thirdparty/minizip
|
114 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/jpeg
|
115 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/libpng
|
116 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/tinyxml )
|
117 |
+
+ ${JPEG_INCLUDE_DIR}
|
118 |
+
+ ${PNG_INCLUDE_DIRS}
|
119 |
+
+ ${TINYXML_INCLUDE_DIR} )
|
120 |
+
|
121 |
+
# Add executable build target
|
122 |
+
add_executable(ConsoleDemo ${source_files} ${header_files})
|
123 |
+
@@ -26,3 +26,7 @@ add_executable(ConsoleDemo ${source_files} ${header_files})
|
124 |
+
target_link_libraries(ConsoleDemo CrashRpt)
|
125 |
+
|
126 |
+
set_target_properties(ConsoleDemo PROPERTIES DEBUG_POSTFIX d )
|
127 |
+
+
|
128 |
+
+install(TARGETS ConsoleDemo
|
129 |
+
+ RUNTIME DESTINATION tools/crashrpt
|
130 |
+
+)
|
131 |
+
diff --git a/demos/MFCDemo/CMakeLists.txt b/demos/MFCDemo/CMakeLists.txt
|
132 |
+
index a250ecc..ade93cb 100644
|
133 |
+
--- a/demos/MFCDemo/CMakeLists.txt
|
134 |
+
+++ b/demos/MFCDemo/CMakeLists.txt
|
135 |
+
@@ -44,7 +44,7 @@ if(CMAKE_CL_64)
|
136 |
+
ADD_CUSTOM_COMMAND(
|
137 |
+
TARGET WTLDemo
|
138 |
+
POST_BUILD
|
139 |
+
- COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
|
140 |
+
+ #COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
|
141 |
+
COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.ini\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
|
142 |
+
COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.log\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
|
143 |
+
COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/lang_files\\crashrpt_lang_EN.ini\" \"${CMAKE_BINARY_DIR}/bin\\x64\\crashrpt_lang.ini\""
|
144 |
+
@@ -53,9 +53,13 @@ else(CMAKE_CL_64)
|
145 |
+
ADD_CUSTOM_COMMAND(
|
146 |
+
TARGET WTLDemo
|
147 |
+
POST_BUILD
|
148 |
+
- COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\""
|
149 |
+
+ #COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\""
|
150 |
+
COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.ini\" \"${CMAKE_BINARY_DIR}/bin\""
|
151 |
+
COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.log\" \"${CMAKE_BINARY_DIR}/bin\""
|
152 |
+
COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/lang_files\\crashrpt_lang_EN.ini\" \"${CMAKE_BINARY_DIR}/bin\\crashrpt_lang.ini\""
|
153 |
+
)
|
154 |
+
-endif(CMAKE_CL_64)
|
155 |
+
|
156 |
+
+endif(CMAKE_CL_64)
|
157 |
+
+
|
158 |
+
+install(TARGETS MFCDemo
|
159 |
+
+ RUNTIME DESTINATION tools/crashrpt
|
160 |
+
+)
|
161 |
+
diff --git a/demos/WTLDemo/AboutDlg.h b/demos/WTLDemo/AboutDlg.h
|
162 |
+
index 83eaac0..e96d1c2 100644
|
163 |
+
--- a/demos/WTLDemo/AboutDlg.h
|
164 |
+
+++ b/demos/WTLDemo/AboutDlg.h
|
165 |
+
@@ -33,7 +33,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
166 |
+
#pragma once
|
167 |
+
#include "stdafx.h"
|
168 |
+
#include <shellapi.h>
|
169 |
+
-#include <atlctrlx.h>
|
170 |
+
+#include <wtl/atlctrlx.h>
|
171 |
+
#include "CrashRpt.h"
|
172 |
+
|
173 |
+
class CAboutDlg : public CDialogImpl<CAboutDlg>
|
174 |
+
diff --git a/demos/WTLDemo/CMakeLists.txt b/demos/WTLDemo/CMakeLists.txt
|
175 |
+
index 40aaefb..42c0f5a 100644
|
176 |
+
--- a/demos/WTLDemo/CMakeLists.txt
|
177 |
+
+++ b/demos/WTLDemo/CMakeLists.txt
|
178 |
+
@@ -19,7 +19,7 @@ fix_default_compiler_settings_()
|
179 |
+
|
180 |
+
# Add include dir
|
181 |
+
include_directories(${CMAKE_SOURCE_DIR}/include
|
182 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/wtl)
|
183 |
+
+ ${WTL_INCLUDE_DIR})
|
184 |
+
|
185 |
+
# Add executable build target
|
186 |
+
add_executable(WTLDemo WIN32 ${source_files} ${header_files})
|
187 |
+
@@ -36,7 +36,7 @@ if(CMAKE_CL_64)
|
188 |
+
ADD_CUSTOM_COMMAND(
|
189 |
+
TARGET WTLDemo
|
190 |
+
POST_BUILD
|
191 |
+
- COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
|
192 |
+
+ #COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
|
193 |
+
COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.ini\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
|
194 |
+
COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.log\" \"${CMAKE_BINARY_DIR}/bin\\x64\""
|
195 |
+
COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/lang_files\\crashrpt_lang_EN.ini\" \"${CMAKE_BINARY_DIR}/bin\\x64\\crashrpt_lang.ini\""
|
196 |
+
@@ -45,9 +45,13 @@ else(CMAKE_CL_64)
|
197 |
+
ADD_CUSTOM_COMMAND(
|
198 |
+
TARGET WTLDemo
|
199 |
+
POST_BUILD
|
200 |
+
- COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\""
|
201 |
+
+ #COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/bin\\dbghelp.dll\" \"${CMAKE_BINARY_DIR}/bin\""
|
202 |
+
COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.ini\" \"${CMAKE_BINARY_DIR}/bin\""
|
203 |
+
COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/demos/WTLDemo\\dummy.log\" \"${CMAKE_BINARY_DIR}/bin\""
|
204 |
+
COMMAND copy ARGS "\"${CMAKE_SOURCE_DIR}/lang_files\\crashrpt_lang_EN.ini\" \"${CMAKE_BINARY_DIR}/bin\\crashrpt_lang.ini\""
|
205 |
+
)
|
206 |
+
-endif(CMAKE_CL_64)
|
207 |
+
|
208 |
+
+endif(CMAKE_CL_64)
|
209 |
+
+
|
210 |
+
+install(TARGETS WTLDemo
|
211 |
+
+ RUNTIME DESTINATION tools/crashrpt
|
212 |
+
+)
|
213 |
+
diff --git a/demos/WTLDemo/DocumentDlg.h b/demos/WTLDemo/DocumentDlg.h
|
214 |
+
index afce8fe..9b47728 100644
|
215 |
+
--- a/demos/WTLDemo/DocumentDlg.h
|
216 |
+
+++ b/demos/WTLDemo/DocumentDlg.h
|
217 |
+
@@ -33,7 +33,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
218 |
+
#pragma once
|
219 |
+
#include "stdafx.h"
|
220 |
+
#include <shellapi.h>
|
221 |
+
-#include <atlctrlx.h>
|
222 |
+
+#include <wtl/atlctrlx.h>
|
223 |
+
#include "CrashRpt.h"
|
224 |
+
|
225 |
+
class CDocumentDlg : public CDialogImpl<CDocumentDlg>
|
226 |
+
diff --git a/demos/WTLDemo/WTLDemo.rc b/demos/WTLDemo/WTLDemo.rc
|
227 |
+
index c651841..71f4b39 100644
|
228 |
+
--- a/demos/WTLDemo/WTLDemo.rc
|
229 |
+
+++ b/demos/WTLDemo/WTLDemo.rc
|
230 |
+
@@ -7,7 +7,7 @@
|
231 |
+
//
|
232 |
+
// Generated from the TEXTINCLUDE 2 resource.
|
233 |
+
//
|
234 |
+
-#include "atlres.h"
|
235 |
+
+#include "wtl/atlres.h"
|
236 |
+
|
237 |
+
/////////////////////////////////////////////////////////////////////////////
|
238 |
+
#undef APSTUDIO_READONLY_SYMBOLS
|
239 |
+
@@ -32,7 +32,7 @@ END
|
240 |
+
|
241 |
+
2 TEXTINCLUDE
|
242 |
+
BEGIN
|
243 |
+
- "#include ""atlres.h""\r\n"
|
244 |
+
+ "#include ""wtl/atlres.h""\r\n"
|
245 |
+
"\0"
|
246 |
+
END
|
247 |
+
|
248 |
+
diff --git a/demos/WTLDemo/stdafx.h b/demos/WTLDemo/stdafx.h
|
249 |
+
index a601446..658d9e5 100644
|
250 |
+
--- a/demos/WTLDemo/stdafx.h
|
251 |
+
+++ b/demos/WTLDemo/stdafx.h
|
252 |
+
@@ -16,10 +16,10 @@ be found in the Authors.txt file in the root of the source tree.
|
253 |
+
#pragma once
|
254 |
+
|
255 |
+
// Change these values to use different versions
|
256 |
+
-#define WINVER 0x0500
|
257 |
+
+#define WINVER 0x0501
|
258 |
+
#define _WIN32_WINNT 0x0501
|
259 |
+
-#define _WIN32_IE 0x0501
|
260 |
+
-#define _RICHEDIT_VER 0x0200
|
261 |
+
+#define _WIN32_IE 0x0600
|
262 |
+
+#define _RICHEDIT_VER 0x0300
|
263 |
+
|
264 |
+
#include <atldef.h>
|
265 |
+
#if ( _ATL_VER < 0x0800 )
|
266 |
+
@@ -52,18 +52,18 @@ namespace ATL
|
267 |
+
};
|
268 |
+
#endif // _WTL_SUPPORT_SDK_ATL3
|
269 |
+
|
270 |
+
-#include <atlapp.h>
|
271 |
+
+#include <wtl/atlapp.h>
|
272 |
+
|
273 |
+
extern CAppModule _Module;
|
274 |
+
|
275 |
+
#include <atlwin.h>
|
276 |
+
|
277 |
+
-#include <atlframe.h>
|
278 |
+
-#include <atlctrls.h>
|
279 |
+
-#include <atldlgs.h>
|
280 |
+
+#include <wtl/atlframe.h>
|
281 |
+
+#include <wtl/atlctrls.h>
|
282 |
+
+#include <wtl/atldlgs.h>
|
283 |
+
|
284 |
+
#define _WTL_USE_CSTRING
|
285 |
+
-#include <atlmisc.h>
|
286 |
+
+#include <wtl/atlmisc.h>
|
287 |
+
|
288 |
+
#if _MSC_VER>=1400
|
289 |
+
#if defined _M_IX86
|
290 |
+
diff --git a/processing/crashrptprobe/CMakeLists.txt b/processing/crashrptprobe/CMakeLists.txt
|
291 |
+
index a6c692a..c513c6d 100644
|
292 |
+
--- a/processing/crashrptprobe/CMakeLists.txt
|
293 |
+
+++ b/processing/crashrptprobe/CMakeLists.txt
|
294 |
+
@@ -21,11 +21,11 @@ fix_default_compiler_settings_()
|
295 |
+
include_directories( ${CMAKE_SOURCE_DIR}/include
|
296 |
+
${CMAKE_SOURCE_DIR}/reporting/crashrpt
|
297 |
+
${CMAKE_SOURCE_DIR}/reporting/crashsender
|
298 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/wtl
|
299 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/zlib
|
300 |
+
+ ${WTL_INCLUDE_DIR}
|
301 |
+
+ ${ZLIB_INCLUDE_DIRS}
|
302 |
+
${CMAKE_SOURCE_DIR}/thirdparty/minizip
|
303 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/tinyxml
|
304 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/include)
|
305 |
+
+ ${TINYXML_INCLUDE_DIR}
|
306 |
+
+ ${DBGHELP_INCLUDE_DIR})
|
307 |
+
|
308 |
+
# Add library build target
|
309 |
+
if(CRASHRPT_BUILD_SHARED_LIBS)
|
310 |
+
@@ -34,15 +34,15 @@ else(CRASHRPT_BUILD_SHARED_LIBS)
|
311 |
+
add_library(CrashRptProbe STATIC ${source_files} ${header_files})
|
312 |
+
endif(CRASHRPT_BUILD_SHARED_LIBS)
|
313 |
+
|
314 |
+
-if(CMAKE_CL_64)
|
315 |
+
- link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64 )
|
316 |
+
- target_link_libraries(CrashRptProbe ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64/dbghelp.lib)
|
317 |
+
-else(CMAKE_CL_64)
|
318 |
+
- link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib )
|
319 |
+
- target_link_libraries(CrashRptProbe ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/dbghelp.lib)
|
320 |
+
-endif(CMAKE_CL_64)
|
321 |
+
+#if(CMAKE_CL_64)
|
322 |
+
+# link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64 )
|
323 |
+
+# target_link_libraries(CrashRptProbe ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64/dbghelp.lib)
|
324 |
+
+#else(CMAKE_CL_64)
|
325 |
+
+# link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib )
|
326 |
+
+# target_link_libraries(CrashRptProbe ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/dbghelp.lib)
|
327 |
+
+#endif(CMAKE_CL_64)
|
328 |
+
|
329 |
+
-target_link_libraries(CrashRptProbe zlib minizip tinyxml Rpcrt4.lib shell32.lib gdi32.lib version.lib psapi.lib)
|
330 |
+
+target_link_libraries(CrashRptProbe ZLIB::ZLIB minizip ${TINYXML_LIBRARY} ${DBGHELP_LIBRARY} Rpcrt4.lib shell32.lib gdi32.lib version.lib psapi.lib)
|
331 |
+
|
332 |
+
if(CRASHRPT_BUILD_SHARED_LIBS)
|
333 |
+
|
334 |
+
@@ -58,4 +58,11 @@ else(CRASHRPT_BUILD_SHARED_LIBS)
|
335 |
+
|
336 |
+
endif(CRASHRPT_BUILD_SHARED_LIBS)
|
337 |
+
|
338 |
+
+set_target_properties(CrashRptProbe PROPERTIES PUBLIC_HEADER ${CMAKE_SOURCE_DIR}/include/CrashRptProbe.h)
|
339 |
+
|
340 |
+
+INSTALL(TARGETS CrashRptProbe
|
341 |
+
+ PUBLIC_HEADER DESTINATION include/crashrpt
|
342 |
+
+ LIBRARY
|
343 |
+
+ ARCHIVE
|
344 |
+
+ RUNTIME
|
345 |
+
+)
|
346 |
+
diff --git a/processing/crashrptprobe/CrashRptProbe.rc b/processing/crashrptprobe/CrashRptProbe.rc
|
347 |
+
index a08f63e..e12b8e9 100644
|
348 |
+
--- a/processing/crashrptprobe/CrashRptProbe.rc
|
349 |
+
+++ b/processing/crashrptprobe/CrashRptProbe.rc
|
350 |
+
@@ -7,7 +7,7 @@
|
351 |
+
//
|
352 |
+
// Generated from the TEXTINCLUDE 2 resource.
|
353 |
+
//
|
354 |
+
-#include "atlres.h"
|
355 |
+
+#include "wtl/atlres.h"
|
356 |
+
|
357 |
+
/////////////////////////////////////////////////////////////////////////////
|
358 |
+
#undef APSTUDIO_READONLY_SYMBOLS
|
359 |
+
@@ -32,7 +32,7 @@ END
|
360 |
+
|
361 |
+
2 TEXTINCLUDE
|
362 |
+
BEGIN
|
363 |
+
- "#include ""atlres.h""\r\n"
|
364 |
+
+ "#include ""wtl/atlres.h""\r\n"
|
365 |
+
"\0"
|
366 |
+
END
|
367 |
+
|
368 |
+
diff --git a/processing/crashrptprobe/stdafx.h b/processing/crashrptprobe/stdafx.h
|
369 |
+
index 2b027b2..0b60659 100644
|
370 |
+
--- a/processing/crashrptprobe/stdafx.h
|
371 |
+
+++ b/processing/crashrptprobe/stdafx.h
|
372 |
+
@@ -70,13 +70,13 @@ namespace ATL
|
373 |
+
};
|
374 |
+
#endif // _WTL_SUPPORT_SDK_ATL3
|
375 |
+
|
376 |
+
-#include <atlapp.h>
|
377 |
+
+#include <wtl/atlapp.h>
|
378 |
+
extern CAppModule _Module;
|
379 |
+
#include <atlwin.h>
|
380 |
+
|
381 |
+
// CString-related includes
|
382 |
+
#define _WTL_USE_CSTRING
|
383 |
+
-#include <atlmisc.h>
|
384 |
+
+#include <wtl/atlmisc.h>
|
385 |
+
|
386 |
+
#if _MSC_VER<1400
|
387 |
+
#define WCSNCPY_S(strDest, sizeInBytes, strSource, count) wcsncpy(strDest, strSource, count)
|
388 |
+
diff --git a/processing/crprober/CMakeLists.txt b/processing/crprober/CMakeLists.txt
|
389 |
+
index 046ba57..255e200 100644
|
390 |
+
--- a/processing/crprober/CMakeLists.txt
|
391 |
+
+++ b/processing/crprober/CMakeLists.txt
|
392 |
+
@@ -18,4 +18,8 @@ add_executable(crprober ${source_files} ${header_files})
|
393 |
+
# Add input link libraries
|
394 |
+
target_link_libraries(crprober CrashRptProbe)
|
395 |
+
|
396 |
+
-set_target_properties(crprober PROPERTIES DEBUG_POSTFIX d )
|
397 |
+
|
398 |
+
+set_target_properties(crprober PROPERTIES DEBUG_POSTFIX d )
|
399 |
+
+
|
400 |
+
+install(TARGETS crprober
|
401 |
+
+ RUNTIME DESTINATION tools/crashrpt
|
402 |
+
+)
|
403 |
+
diff --git a/reporting/crashrpt/CMakeLists.txt b/reporting/crashrpt/CMakeLists.txt
|
404 |
+
index 42d40e2..c7e4fd6 100644
|
405 |
+
--- a/reporting/crashrpt/CMakeLists.txt
|
406 |
+
+++ b/reporting/crashrpt/CMakeLists.txt
|
407 |
+
@@ -18,7 +18,7 @@ add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE)
|
408 |
+
fix_default_compiler_settings_()
|
409 |
+
|
410 |
+
# Add include dir
|
411 |
+
-include_directories( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/thirdparty/wtl)
|
412 |
+
+include_directories( ${CMAKE_SOURCE_DIR}/include ${WTL_INCLUDE_DIR})
|
413 |
+
|
414 |
+
# Add library build target
|
415 |
+
if(CRASHRPT_BUILD_SHARED_LIBS)
|
416 |
+
@@ -55,3 +55,11 @@ else(CRASHRPT_BUILD_SHARED_LIBS)
|
417 |
+
RELEASE_POSTFIX LIB )
|
418 |
+
endif(CRASHRPT_BUILD_SHARED_LIBS)
|
419 |
+
|
420 |
+
+set_target_properties(CrashRpt PROPERTIES PUBLIC_HEADER ${CMAKE_SOURCE_DIR}/include/CrashRpt.h)
|
421 |
+
+
|
422 |
+
+INSTALL(TARGETS CrashRpt
|
423 |
+
+ PUBLIC_HEADER DESTINATION include/crashrpt
|
424 |
+
+ LIBRARY
|
425 |
+
+ ARCHIVE
|
426 |
+
+ RUNTIME
|
427 |
+
+)
|
428 |
+
diff --git a/reporting/crashrpt/CrashRpt.rc b/reporting/crashrpt/CrashRpt.rc
|
429 |
+
index 95e7502..a8c821b 100644
|
430 |
+
--- a/reporting/crashrpt/CrashRpt.rc
|
431 |
+
+++ b/reporting/crashrpt/CrashRpt.rc
|
432 |
+
@@ -7,7 +7,7 @@
|
433 |
+
//
|
434 |
+
// Generated from the TEXTINCLUDE 2 resource.
|
435 |
+
//
|
436 |
+
-#include "atlres.h"
|
437 |
+
+#include "wtl/atlres.h"
|
438 |
+
|
439 |
+
/////////////////////////////////////////////////////////////////////////////
|
440 |
+
#undef APSTUDIO_READONLY_SYMBOLS
|
441 |
+
@@ -32,7 +32,7 @@ END
|
442 |
+
|
443 |
+
2 TEXTINCLUDE
|
444 |
+
BEGIN
|
445 |
+
- "#include ""atlres.h""\r\n"
|
446 |
+
+ "#include ""wtl/atlres.h""\r\n"
|
447 |
+
"\0"
|
448 |
+
END
|
449 |
+
|
450 |
+
diff --git a/reporting/crashrpt/StdAfx.h b/reporting/crashrpt/StdAfx.h
|
451 |
+
index 77d8c36..13bbe50 100644
|
452 |
+
--- a/reporting/crashrpt/StdAfx.h
|
453 |
+
+++ b/reporting/crashrpt/StdAfx.h
|
454 |
+
@@ -19,7 +19,7 @@ be found in the Authors.txt file in the root of the source tree.
|
455 |
+
#define WINVER 0x0501
|
456 |
+
#define _WIN32_WINNT 0x0501
|
457 |
+
#define _WIN32_IE 0x0600
|
458 |
+
-#define _RICHEDIT_VER 0x0200
|
459 |
+
+#define _RICHEDIT_VER 0x0300
|
460 |
+
|
461 |
+
#include <errno.h>
|
462 |
+
#include <atldef.h>
|
463 |
+
@@ -54,12 +54,12 @@ namespace ATL
|
464 |
+
};
|
465 |
+
#endif // _WTL_SUPPORT_SDK_ATL3
|
466 |
+
|
467 |
+
-#include <atlapp.h>
|
468 |
+
+#include <wtl/atlapp.h>
|
469 |
+
extern CAppModule _Module;
|
470 |
+
#include <atlwin.h>
|
471 |
+
// CString-related includes
|
472 |
+
#define _WTL_USE_CSTRING
|
473 |
+
-#include <atlmisc.h>
|
474 |
+
+#include <wtl/atlmisc.h>
|
475 |
+
#include <new.h>
|
476 |
+
#include <map>
|
477 |
+
#include <set>
|
478 |
+
diff --git a/reporting/crashsender/CMakeLists.txt b/reporting/crashsender/CMakeLists.txt
|
479 |
+
index 9b444c5..aa4ab8a 100644
|
480 |
+
--- a/reporting/crashsender/CMakeLists.txt
|
481 |
+
+++ b/reporting/crashsender/CMakeLists.txt
|
482 |
+
@@ -22,27 +22,27 @@ fix_default_compiler_settings_()
|
483 |
+
# Add include dir
|
484 |
+
include_directories( ${CMAKE_SOURCE_DIR}/include
|
485 |
+
${CMAKE_SOURCE_DIR}/reporting/CrashRpt
|
486 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/wtl
|
487 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/zlib
|
488 |
+
+ ${WTL_INCLUDE_DIR}
|
489 |
+
${CMAKE_SOURCE_DIR}/thirdparty/minizip
|
490 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/jpeg
|
491 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/libpng
|
492 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/tinyxml
|
493 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/include
|
494 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/libogg/include
|
495 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/libtheora/include)
|
496 |
+
-
|
497 |
+
-if(NOT CMAKE_CL_64)
|
498 |
+
- link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib )
|
499 |
+
-else(NOT CMAKE_CL_64)
|
500 |
+
- link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64 )
|
501 |
+
-endif(NOT CMAKE_CL_64)
|
502 |
+
+ ${ZLIB_INCLUDE_DIRS}
|
503 |
+
+ ${JPEG_INCLUDE_DIR}
|
504 |
+
+ ${PNG_INCLUDE_DIRS}
|
505 |
+
+ ${TINYXML_INCLUDE_DIR}
|
506 |
+
+ ${DBGHELP_INCLUDE_DIR}
|
507 |
+
+ ${OGG_INCLUDE_DIRS}
|
508 |
+
+ ${THEORA_INCLUDE_DIR})
|
509 |
+
+
|
510 |
+
+#if(NOT CMAKE_CL_64)
|
511 |
+
+# link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib )
|
512 |
+
+#else(NOT CMAKE_CL_64)
|
513 |
+
+# link_directories( ${CMAKE_SOURCE_DIR}/thirdparty/dbghelp/lib/amd64 )
|
514 |
+
+#endif(NOT CMAKE_CL_64)
|
515 |
+
|
516 |
+
# Add executable build target
|
517 |
+
add_executable(CrashSender WIN32 ${source_files} ${header_files})
|
518 |
+
|
519 |
+
# Add input link libraries
|
520 |
+
-target_link_libraries(CrashSender zlib minizip libjpeg libpng tinyxml libogg libtheora WS2_32.lib Dnsapi.lib wininet.lib Rpcrt4.lib Gdi32.lib shell32.lib Comdlg32.lib version.lib psapi.lib)
|
521 |
+
+target_link_libraries(CrashSender ZLIB::ZLIB minizip ${JPEG_LIBRARIES} PNG::PNG ${TINYXML_LIBRARY} Ogg::ogg ${THEORA_LIBRARY} WS2_32.lib Dnsapi.lib wininet.lib Rpcrt4.lib Gdi32.lib shell32.lib Comdlg32.lib version.lib psapi.lib)
|
522 |
+
|
523 |
+
# Add compiler flags (/MP for multi-processor compilation, /Os to favor small code)
|
524 |
+
set_target_properties(CrashRpt PROPERTIES COMPILE_FLAGS "/Os")
|
525 |
+
@@ -52,4 +52,12 @@ set_target_properties(CrashRpt PROPERTIES COMPILE_FLAGS "/Os")
|
526 |
+
|
527 |
+
set_target_properties(CrashSender PROPERTIES
|
528 |
+
DEBUG_POSTFIX ${CRASHRPT_VER}d
|
529 |
+
- RELEASE_POSTFIX ${CRASHRPT_VER} )
|
530 |
+
|
531 |
+
+ RELEASE_POSTFIX ${CRASHRPT_VER} )
|
532 |
+
+
|
533 |
+
+install(TARGETS CrashSender
|
534 |
+
+ RUNTIME DESTINATION tools/crashrpt
|
535 |
+
+)
|
536 |
+
+
|
537 |
+
+file(GLOB LANG_FILES "${CMAKE_SOURCE_DIR}/lang_files/crashrpt_lang_*.ini")
|
538 |
+
+install(FILES ${LANG_FILES} DESTINATION tools/crashrpt)
|
539 |
+
+install(FILES "${CMAKE_SOURCE_DIR}/lang_files/crashrpt_lang_EN.ini" DESTINATION tools/crashrpt RENAME crashrpt_lang.ini)
|
540 |
+
diff --git a/reporting/crashsender/CrashSender.rc b/reporting/crashsender/CrashSender.rc
|
541 |
+
index 0502962..e10e269 100644
|
542 |
+
--- a/reporting/crashsender/CrashSender.rc
|
543 |
+
+++ b/reporting/crashsender/CrashSender.rc
|
544 |
+
@@ -7,7 +7,7 @@
|
545 |
+
//
|
546 |
+
// Generated from the TEXTINCLUDE 2 resource.
|
547 |
+
//
|
548 |
+
-#include "atlres.h"
|
549 |
+
+#include "wtl/atlres.h"
|
550 |
+
|
551 |
+
/////////////////////////////////////////////////////////////////////////////
|
552 |
+
#undef APSTUDIO_READONLY_SYMBOLS
|
553 |
+
@@ -243,7 +243,7 @@ END
|
554 |
+
|
555 |
+
2 TEXTINCLUDE
|
556 |
+
BEGIN
|
557 |
+
- "#include ""atlres.h""\r\n"
|
558 |
+
+ "#include ""wtl/atlres.h""\r\n"
|
559 |
+
"\0"
|
560 |
+
END
|
561 |
+
|
562 |
+
diff --git a/reporting/crashsender/ErrorReportSender.cpp b/reporting/crashsender/ErrorReportSender.cpp
|
563 |
+
index ac9603c..64cf2b5 100644
|
564 |
+
--- a/reporting/crashsender/ErrorReportSender.cpp
|
565 |
+
+++ b/reporting/crashsender/ErrorReportSender.cpp
|
566 |
+
@@ -722,9 +722,9 @@ BOOL CErrorReportSender::CreateMiniDump()
|
567 |
+
CompiledApiVer.Reserved = 0;
|
568 |
+
LPAPI_VERSION pActualApiVer = lpImagehlpApiVersionEx(&CompiledApiVer);
|
569 |
+
pActualApiVer;
|
570 |
+
- ATLASSERT(CompiledApiVer.MajorVersion==pActualApiVer->MajorVersion);
|
571 |
+
- ATLASSERT(CompiledApiVer.MinorVersion==pActualApiVer->MinorVersion);
|
572 |
+
- ATLASSERT(CompiledApiVer.Revision==pActualApiVer->Revision);
|
573 |
+
+ //ATLASSERT(CompiledApiVer.MajorVersion==pActualApiVer->MajorVersion);
|
574 |
+
+ //ATLASSERT(CompiledApiVer.MinorVersion==pActualApiVer->MinorVersion);
|
575 |
+
+ //ATLASSERT(CompiledApiVer.Revision==pActualApiVer->Revision);
|
576 |
+
}
|
577 |
+
|
578 |
+
// Write minidump to the file
|
579 |
+
@@ -1086,7 +1086,7 @@ BOOL CErrorReportSender::CreateCrashDescriptionXML(CErrorReportInfo& eri)
|
580 |
+
goto cleanup;
|
581 |
+
}
|
582 |
+
|
583 |
+
- doc.useMicrosoftBOM = true;
|
584 |
+
+ //doc.useMicrosoftBOM = true;
|
585 |
+
bool bSave = doc.SaveFile(f);
|
586 |
+
if(!bSave)
|
587 |
+
{
|
588 |
+
diff --git a/reporting/crashsender/FilePreviewCtrl.cpp b/reporting/crashsender/FilePreviewCtrl.cpp
|
589 |
+
index e71aafc..5650291 100644
|
590 |
+
--- a/reporting/crashsender/FilePreviewCtrl.cpp
|
591 |
+
+++ b/reporting/crashsender/FilePreviewCtrl.cpp
|
592 |
+
@@ -365,7 +365,7 @@ BOOL CImage::LoadBitmapFromPNGFile(LPTSTR szFileName)
|
593 |
+
if (!png_ptr)
|
594 |
+
goto cleanup;
|
595 |
+
|
596 |
+
- if (setjmp(png_ptr->jmpbuf))
|
597 |
+
+ if (setjmp(png_jmpbuf(png_ptr)))
|
598 |
+
goto cleanup;
|
599 |
+
|
600 |
+
info_ptr = png_create_info_struct(png_ptr);
|
601 |
+
@@ -389,7 +389,7 @@ BOOL CImage::LoadBitmapFromPNGFile(LPTSTR szFileName)
|
602 |
+
width = png_get_image_width(png_ptr, info_ptr);
|
603 |
+
height = png_get_image_height(png_ptr, info_ptr);
|
604 |
+
|
605 |
+
- if(info_ptr->channels==3)
|
606 |
+
+ if (png_get_channels(png_ptr, info_ptr) == 3)
|
607 |
+
{
|
608 |
+
png_set_strip_16(png_ptr);
|
609 |
+
png_set_packing(png_ptr);
|
610 |
+
@@ -408,14 +408,14 @@ BOOL CImage::LoadBitmapFromPNGFile(LPTSTR szFileName)
|
611 |
+
pBMI = (BITMAPINFO*)new BYTE[sizeof(BITMAPINFO)+256*4];
|
612 |
+
memset(pBMI, 0, sizeof(BITMAPINFO)+256*4);
|
613 |
+
pBMI->bmiHeader.biSize = sizeof(BITMAPINFO);
|
614 |
+
- pBMI->bmiHeader.biBitCount = 8*info_ptr->channels;
|
615 |
+
+ pBMI->bmiHeader.biBitCount = 8 * png_get_channels(png_ptr, info_ptr);
|
616 |
+
pBMI->bmiHeader.biWidth = width;
|
617 |
+
pBMI->bmiHeader.biHeight = height;
|
618 |
+
pBMI->bmiHeader.biPlanes = 1;
|
619 |
+
pBMI->bmiHeader.biCompression = BI_RGB;
|
620 |
+
pBMI->bmiHeader.biSizeImage = rowbytes*height;
|
621 |
+
|
622 |
+
- if( info_ptr->channels == 1 )
|
623 |
+
+ if (png_get_channels(png_ptr, info_ptr) == 1)
|
624 |
+
{
|
625 |
+
RGBQUAD* palette = pBMI->bmiColors;
|
626 |
+
|
627 |
+
@@ -431,7 +431,7 @@ BOOL CImage::LoadBitmapFromPNGFile(LPTSTR szFileName)
|
628 |
+
|
629 |
+
for(y=height-1; y>=0; y--)
|
630 |
+
{
|
631 |
+
- png_read_rows(png_ptr, &row, png_bytepp_NULL, 1);
|
632 |
+
+ png_read_rows(png_ptr, &row, NULL, 1);
|
633 |
+
|
634 |
+
{
|
635 |
+
CAutoLock lock(&m_csLock);
|
636 |
+
diff --git a/reporting/crashsender/ScreenCap.cpp b/reporting/crashsender/ScreenCap.cpp
|
637 |
+
index c183c19..8f5643d 100644
|
638 |
+
--- a/reporting/crashsender/ScreenCap.cpp
|
639 |
+
+++ b/reporting/crashsender/ScreenCap.cpp
|
640 |
+
@@ -11,6 +11,7 @@ be found in the Authors.txt file in the root of the source tree.
|
641 |
+
#include "stdafx.h"
|
642 |
+
#include "ScreenCap.h"
|
643 |
+
#include "Utility.h"
|
644 |
+
+#include "zlib.h"
|
645 |
+
|
646 |
+
// Disable warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable
|
647 |
+
#pragma warning(disable:4611)
|
648 |
+
diff --git a/reporting/crashsender/stdafx.h b/reporting/crashsender/stdafx.h
|
649 |
+
index f087ff4..4494d3a 100644
|
650 |
+
--- a/reporting/crashsender/stdafx.h
|
651 |
+
+++ b/reporting/crashsender/stdafx.h
|
652 |
+
@@ -19,7 +19,7 @@ be found in the Authors.txt file in the root of the source tree.
|
653 |
+
#define WINVER 0x0501
|
654 |
+
#define _WIN32_WINNT 0x0501
|
655 |
+
#define _WIN32_IE 0x0600
|
656 |
+
-#define _RICHEDIT_VER 0x0200
|
657 |
+
+#define _RICHEDIT_VER 0x0300
|
658 |
+
|
659 |
+
typedef __int64 off_t, _off_t;
|
660 |
+
#define _OFF_T_DEFINED
|
661 |
+
@@ -61,19 +61,19 @@ namespace ATL
|
662 |
+
};
|
663 |
+
#endif // _WTL_SUPPORT_SDK_ATL3
|
664 |
+
|
665 |
+
-#include <atlapp.h>
|
666 |
+
+#include <wtl/atlapp.h>
|
667 |
+
|
668 |
+
extern CAppModule _Module;
|
669 |
+
|
670 |
+
#include <atlwin.h>
|
671 |
+
|
672 |
+
-#include <atlframe.h>
|
673 |
+
-#include <atlctrls.h>
|
674 |
+
-#include <atldlgs.h>
|
675 |
+
-#include <atlctrlx.h>
|
676 |
+
+#include <wtl/atlframe.h>
|
677 |
+
+#include <wtl/atlctrls.h>
|
678 |
+
+#include <wtl/atldlgs.h>
|
679 |
+
+#include <wtl/atlctrlx.h>
|
680 |
+
|
681 |
+
#define _WTL_USE_CSTRING
|
682 |
+
-#include <atlmisc.h>
|
683 |
+
+#include <wtl/atlmisc.h>
|
684 |
+
|
685 |
+
#include <string>
|
686 |
+
#include <vector>
|
687 |
+
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
688 |
+
index f7bfede..9358bef 100644
|
689 |
+
--- a/tests/CMakeLists.txt
|
690 |
+
+++ b/tests/CMakeLists.txt
|
691 |
+
@@ -32,7 +32,7 @@ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG")
|
692 |
+
# Add include dir
|
693 |
+
include_directories( ${CMAKE_SOURCE_DIR}/include
|
694 |
+
${CMAKE_SOURCE_DIR}/reporting/CrashRpt
|
695 |
+
- ${CMAKE_SOURCE_DIR}/thirdparty/wtl )
|
696 |
+
+ ${WTL_INCLUDE_DIR} )
|
697 |
+
|
698 |
+
# Add executable build target
|
699 |
+
add_executable(Tests ${source_files} ${header_files})
|
700 |
+
@@ -42,3 +42,10 @@ target_link_libraries(Tests CrashRpt CrashRptProbe)
|
701 |
+
|
702 |
+
set_target_properties(Tests PROPERTIES DEBUG_POSTFIX d )
|
703 |
+
#set_target_properties(Tests PROPERTIES COMPILE_FLAGS "/Zi" LINK_FLAGS "/DEBUG")
|
704 |
+
+
|
705 |
+
+install(TARGETS Tests
|
706 |
+
+ RUNTIME DESTINATION tools/crashrpt
|
707 |
+
+)
|
708 |
+
+
|
709 |
+
+install(FILES "${CMAKE_SOURCE_DIR}/demos/WTLDemo/dummy.ini" DESTINATION tools/crashrpt)
|
710 |
+
+install(FILES "${CMAKE_SOURCE_DIR}/demos/WTLDemo/dummy.log" DESTINATION tools/crashrpt)
|
711 |
+
diff --git a/tests/stdafx.h b/tests/stdafx.h
|
712 |
+
index f12675b..0ec2117 100644
|
713 |
+
--- a/tests/stdafx.h
|
714 |
+
+++ b/tests/stdafx.h
|
715 |
+
@@ -19,7 +19,7 @@ be found in the Authors.txt file in the root of the source tree.
|
716 |
+
#define WINVER 0x0501
|
717 |
+
#define _WIN32_WINNT 0x0501
|
718 |
+
#define _WIN32_IE 0x0600
|
719 |
+
-#define _RICHEDIT_VER 0x0200
|
720 |
+
+#define _RICHEDIT_VER 0x0300
|
721 |
+
|
722 |
+
#include <errno.h>
|
723 |
+
#include <winsock2.h>
|
724 |
+
@@ -58,15 +58,15 @@ namespace ATL
|
725 |
+
};
|
726 |
+
#endif // _WTL_SUPPORT_SDK_ATL3
|
727 |
+
|
728 |
+
-#include <atlapp.h>
|
729 |
+
+#include <wtl/atlapp.h>
|
730 |
+
|
731 |
+
extern CAppModule _Module;
|
732 |
+
|
733 |
+
#include <atlwin.h>
|
734 |
+
|
735 |
+
-#include <atlframe.h>
|
736 |
+
-#include <atlctrls.h>
|
737 |
+
-#include <atldlgs.h>
|
738 |
+
+#include <wtl/atlframe.h>
|
739 |
+
+#include <wtl/atlctrls.h>
|
740 |
+
+#include <wtl/atldlgs.h>
|
741 |
+
#include <set>
|
742 |
+
#include <map>
|
743 |
+
#include <string>
|
744 |
+
@@ -75,7 +75,7 @@ extern CAppModule _Module;
|
745 |
+
#include <conio.h>
|
746 |
+
|
747 |
+
#define _WTL_USE_CSTRING
|
748 |
+
-#include <atlmisc.h>
|
749 |
+
+#include <wtl/atlmisc.h>
|
750 |
+
|
751 |
+
#if _MSC_VER<1400
|
752 |
+
#define _TCSCPY_S(strDestination, numberOfElements, strSource) _tcscpy(strDestination, strSource)
|
753 |
+
diff --git a/thirdparty/libpng/CMakeLists.txt b/thirdparty/libpng/CMakeLists.txt
|
754 |
+
index b358c4e..e0f7a33 100644
|
755 |
+
--- a/thirdparty/libpng/CMakeLists.txt
|
756 |
+
+++ b/thirdparty/libpng/CMakeLists.txt
|
757 |
+
@@ -7,7 +7,7 @@ aux_source_directory( . source_files )
|
758 |
+
add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE /wd4244 /wd4267)
|
759 |
+
|
760 |
+
# Add include dir
|
761 |
+
-include_directories( ${CMAKE_SOURCE_DIR}/thirdparty/zlib )
|
762 |
+
+include_directories( ${ZLIB_INCLUDE_DIRS} )
|
763 |
+
|
764 |
+
fix_default_compiler_settings_()
|
765 |
+
|
766 |
+
@@ -15,6 +15,6 @@ fix_default_compiler_settings_()
|
767 |
+
add_library(libpng STATIC ${source_files})
|
768 |
+
|
769 |
+
# Add linker input libraries
|
770 |
+
-target_link_libraries(libpng zlib)
|
771 |
+
+target_link_libraries(libpng ZLIB::ZLIB)
|
772 |
+
|
773 |
+
set_target_properties(libpng PROPERTIES DEBUG_POSTFIX d )
|
774 |
+
|
775 |
+
diff --git a/thirdparty/libtheora/CMakeLists.txt b/thirdparty/libtheora/CMakeLists.txt
|
776 |
+
index 896fb47..f3cf5eb 100644
|
777 |
+
--- a/thirdparty/libtheora/CMakeLists.txt
|
778 |
+
+++ b/thirdparty/libtheora/CMakeLists.txt
|
779 |
+
@@ -8,7 +8,7 @@ aux_source_directory( ./lib/x86_vc x86_source_files )
|
780 |
+
add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE /wd4244 /wd4700 /wd4214 /wd4554 /wd4018 /wd4100 /wd4132 /wd4389 /wd4127 /wd4701 /wd4245 /wd4267 /wd4334)
|
781 |
+
|
782 |
+
# Add include dir
|
783 |
+
-include_directories( ${CMAKE_SOURCE_DIR}/thirdparty/libogg/include
|
784 |
+
+include_directories( ${OGG_INCLUDE_DIRS}
|
785 |
+
${CMAKE_SOURCE_DIR}/thirdparty/libtheora/include)
|
786 |
+
|
787 |
+
fix_default_compiler_settings_()
|
788 |
+
diff --git a/thirdparty/minizip/CMakeLists.txt b/thirdparty/minizip/CMakeLists.txt
|
789 |
+
index 5f4d0af..2b015c9 100644
|
790 |
+
--- a/thirdparty/minizip/CMakeLists.txt
|
791 |
+
+++ b/thirdparty/minizip/CMakeLists.txt
|
792 |
+
@@ -7,7 +7,7 @@ aux_source_directory( . source_files )
|
793 |
+
add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE /wd4127 /wd4131 /wd4100 /wd4189 /wd4244)
|
794 |
+
|
795 |
+
# Add include dir
|
796 |
+
-include_directories( ${CMAKE_SOURCE_DIR}/thirdparty/zlib )
|
797 |
+
+include_directories( ${ZLIB_INCLUDE_DIRS} )
|
798 |
+
|
799 |
+
fix_default_compiler_settings_()
|
800 |
+
|
801 |
+
@@ -15,6 +15,6 @@ fix_default_compiler_settings_()
|
802 |
+
add_library(minizip STATIC ${source_files})
|
803 |
+
|
804 |
+
# Add linker input libraries
|
805 |
+
-target_link_libraries(minizip zlib)
|
806 |
+
+target_link_libraries(minizip ZLIB::ZLIB)
|
807 |
+
|
808 |
+
set_target_properties(minizip PROPERTIES DEBUG_POSTFIX d )
|
809 |
+
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashrpt/portfile.cmake
ADDED
@@ -0,0 +1,52 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
|
2 |
+
set(ARCH_DIR "")
|
3 |
+
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
|
4 |
+
set(ARCH_DIR "x64/")
|
5 |
+
else()
|
6 |
+
message(FATAL_ERROR "${PORT} only supports x86 and x64 architectures")
|
7 |
+
endif()
|
8 |
+
|
9 |
+
vcpkg_from_git(
|
10 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
11 |
+
URL https://git.code.sf.net/p/crashrpt/code
|
12 |
+
REF 4616504670be5a425a525376648d912a72ce18f2
|
13 |
+
PATCHES
|
14 |
+
001-add-install-target-and-find-deps.patch
|
15 |
+
)
|
16 |
+
|
17 |
+
# Remove vendored dependencies to ensure they are not picked up by the build
|
18 |
+
# Vendored minizip is still used since it contains modifications needed for CrashRpt
|
19 |
+
foreach(DEPENDENCY dbghelp jpeg libogg libpng libtheora tinyxml wtl zlib)
|
20 |
+
if(EXISTS ${SOURCE_PATH}/thirdparty/${DEPENDENCY})
|
21 |
+
file(REMOVE_RECURSE ${SOURCE_PATH}/thirdparty/${DEPENDENCY})
|
22 |
+
endif()
|
23 |
+
endforeach()
|
24 |
+
|
25 |
+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CRASHRPT_BUILD_SHARED_LIBS)
|
26 |
+
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" CRASHRPT_LINK_CRT_AS_DLL)
|
27 |
+
|
28 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
29 |
+
FEATURES
|
30 |
+
probe CRASHRPT_BUILD_PROBE
|
31 |
+
tests CRASHRPT_BUILD_TESTS
|
32 |
+
demos CRASHRPT_BUILD_DEMOS
|
33 |
+
)
|
34 |
+
|
35 |
+
# PREFER_NINJA is not used below since CrashSender fails to build with errors like this one:
|
36 |
+
# C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.23.28105\ATLMFC\include\atlconv.h(788): error C2440: 'return': cannot convert from 'LPCTSTR' to 'LPCOLESTR'
|
37 |
+
vcpkg_configure_cmake(
|
38 |
+
SOURCE_PATH ${SOURCE_PATH}
|
39 |
+
# PREFER_NINJA
|
40 |
+
OPTIONS
|
41 |
+
-DCRASHRPT_BUILD_SHARED_LIBS=${CRASHRPT_BUILD_SHARED_LIBS}
|
42 |
+
-DCRASHRPT_LINK_CRT_AS_DLL=${CRASHRPT_LINK_CRT_AS_DLL}
|
43 |
+
${FEATURE_OPTIONS}
|
44 |
+
)
|
45 |
+
|
46 |
+
vcpkg_install_cmake()
|
47 |
+
vcpkg_copy_pdbs()
|
48 |
+
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
|
49 |
+
|
50 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
51 |
+
|
52 |
+
file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/crashrpt/vcpkg.json
ADDED
@@ -0,0 +1,38 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "crashrpt",
|
3 |
+
"version": "1.4.3",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "A crash reporting system for Windows applications",
|
6 |
+
"homepage": "http://crashrpt.sourceforge.net/",
|
7 |
+
"supports": "!osx & !linux & !uwp & (x86 | x64)",
|
8 |
+
"dependencies": [
|
9 |
+
"dbghelp",
|
10 |
+
"libjpeg-turbo",
|
11 |
+
"libogg",
|
12 |
+
"libpng",
|
13 |
+
"libtheora",
|
14 |
+
"tinyxml",
|
15 |
+
"wtl",
|
16 |
+
"zlib"
|
17 |
+
],
|
18 |
+
"features": {
|
19 |
+
"demos": {
|
20 |
+
"description": "Demo applications for CrashRptProbe"
|
21 |
+
},
|
22 |
+
"probe": {
|
23 |
+
"description": "The CrashRptProbe library"
|
24 |
+
},
|
25 |
+
"tests": {
|
26 |
+
"description": "Test application for crashrpt",
|
27 |
+
"dependencies": [
|
28 |
+
{
|
29 |
+
"name": "crashrpt",
|
30 |
+
"default-features": false,
|
31 |
+
"features": [
|
32 |
+
"probe"
|
33 |
+
]
|
34 |
+
}
|
35 |
+
]
|
36 |
+
}
|
37 |
+
}
|
38 |
+
}
|
third-party/DPVO/Pangolin/scripts/vcpkg/ports/crc32c/portfile.cmake
ADDED
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO google/crc32c
|
6 |
+
REF 1.1.2
|
7 |
+
SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196
|
8 |
+
HEAD_REF master
|
9 |
+
)
|
10 |
+
|
11 |
+
vcpkg_cmake_configure(
|
12 |
+
SOURCE_PATH ${SOURCE_PATH}
|
13 |
+
OPTIONS
|
14 |
+
-DCRC32C_BUILD_TESTS=OFF
|
15 |
+
-DCRC32C_BUILD_BENCHMARKS=OFF
|
16 |
+
-DCRC32C_USE_GLOG=OFF
|
17 |
+
)
|
18 |
+
|
19 |
+
vcpkg_cmake_install()
|
20 |
+
vcpkg_copy_pdbs()
|
21 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Crc32c)
|
22 |
+
|
23 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
24 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
25 |
+
|
26 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
27 |
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
28 |
+
endif()
|
29 |
+
|
30 |
+
# Handle copyright
|
31 |
+
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|