mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 20:53:09 +08:00
parent
7509b4ce7b
commit
c4b6dbf497
@ -1,15 +0,0 @@
|
||||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||
index 6033244..5e20ffc 100644
|
||||
--- a/cpp/CMakeLists.txt
|
||||
+++ b/cpp/CMakeLists.txt
|
||||
@@ -202,8 +202,9 @@ add_custom_command (
|
||||
DEPENDS ${PROTOBUF_SOURCES}
|
||||
)
|
||||
|
||||
+find_package(absl REQUIRED)
|
||||
+
|
||||
if (${BUILD_GEOCODER} STREQUAL "ON")
|
||||
- find_package(absl)
|
||||
|
||||
# Geocoding data cpp file generation
|
||||
set (TOOLS_DIR "${CMAKE_CURRENT_BINARY_DIR}/tools")
|
@ -1,11 +1,11 @@
|
||||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||
index 82cf898..07d3f62 100644
|
||||
index cdd7a08..627f897 100644
|
||||
--- a/cpp/CMakeLists.txt
|
||||
+++ b/cpp/CMakeLists.txt
|
||||
@@ -149,7 +149,7 @@ set (ICU_INCLUDE_DIR ${ICU_UC_INCLUDE_DIR})
|
||||
@@ -192,7 +192,7 @@ set (ICU_INCLUDE_DIR ${ICU_UC_INCLUDE_DIR})
|
||||
set (ICU_LIB ${ICU_UC_LIB})
|
||||
# If ICU regexp engine is used or if the geocoder is built, use icui18n as well.
|
||||
if (${USE_ICU_REGEXP} STREQUAL "ON" OR ${BUILD_GEOCODER} STREQUAL "ON")
|
||||
if (USE_ICU_REGEXP OR BUILD_GEOCODER)
|
||||
- find_required_library (ICU_I18N unicode/regex.h icui18n "ICU")
|
||||
+ find_required_library (ICU_I18N unicode/regex.h icuin "ICU")
|
||||
check_library_version (PC_ICU_I18N icu-i18n>=4.4)
|
||||
|
@ -3,16 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO google/libphonenumber
|
||||
REF v8.13.1
|
||||
SHA512 e847c263ccc076070a669334536e8f4fe1b6864e8c0cec9992c430b2728512a96d9cdc3e8f0978b79a9fce64edaed85c369773b58706ca189115375ac5dca597
|
||||
REF "v${VERSION}"
|
||||
SHA512 401d6bdfe603ffd994ebb76c8b073e0f0d135390bee72fe4783b5fd9b684e2531af154906f49bf7803d3e720b2d0ccc00fc0ea6fbbd2729556a488c5f5647bee
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
"fix-re2-identifiers.patch"
|
||||
"fix-icui18n-lib-name.patch"
|
||||
"fix-absl-with-geocoder-off.patch"
|
||||
"remove-build-test.patch" # Make build test a feature in future. For now, temp fix.
|
||||
"remove-shared-lib.patch" # Needs -DBUILD_GEOCODER=OFF option
|
||||
# Work on building shared libs in future. For now, temp fix.
|
||||
fix-find-protobuf.patch
|
||||
)
|
||||
|
||||
@ -22,10 +18,13 @@ vcpkg_cmake_configure(
|
||||
-DREGENERATE_METADATA=OFF
|
||||
-DUSE_RE2=ON
|
||||
-DBUILD_GEOCODER=OFF
|
||||
-DUSE_PROTOBUF_LITE=ON)
|
||||
-DUSE_PROTOBUF_LITE=ON
|
||||
-DBUILD_SHARED_LIBS=OFF
|
||||
-DBUILD_TESTING=OFF)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
@ -1,38 +0,0 @@
|
||||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||
index 07d3f62..86f2212 100644
|
||||
--- a/cpp/CMakeLists.txt
|
||||
+++ b/cpp/CMakeLists.txt
|
||||
@@ -126,7 +126,9 @@ if (${USE_BOOST} STREQUAL "OFF" AND ${USE_STDMUTEX} STREQUAL "OFF")
|
||||
find_package (Threads)
|
||||
endif()
|
||||
|
||||
+if (FALSE)
|
||||
find_or_build_gtest ()
|
||||
+endif()
|
||||
|
||||
if (${USE_RE2} STREQUAL "ON")
|
||||
find_required_library (RE2 re2/re2.h re2 "Google RE2")
|
||||
@@ -504,6 +506,7 @@ if (${BUILD_GEOCODER} STREQUAL "ON")
|
||||
target_link_libraries (geocoding-shared ${LIBRARY_DEPS})
|
||||
endif ()
|
||||
|
||||
+if (FALSE)
|
||||
# Build a specific library for testing purposes.
|
||||
add_library (phonenumber_testing STATIC ${TESTING_LIBRARY_SOURCES})
|
||||
if (${BUILD_GEOCODER} STREQUAL "ON")
|
||||
@@ -530,7 +533,6 @@ if (${BUILD_GEOCODER} STREQUAL "ON")
|
||||
)
|
||||
endif ()
|
||||
|
||||
-
|
||||
set (TEST_SOURCES
|
||||
"test/phonenumbers/asyoutypeformatter_test.cc"
|
||||
"test/phonenumbers/logger_test.cc"
|
||||
@@ -588,6 +590,7 @@ else ()
|
||||
DEPENDS libphonenumber_test
|
||||
)
|
||||
endif ()
|
||||
+endif ()
|
||||
|
||||
# Install rules.
|
||||
install (FILES
|
@ -1,13 +0,0 @@
|
||||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||
index e5c5a5f..386b159 100644
|
||||
--- a/cpp/CMakeLists.txt
|
||||
+++ b/cpp/CMakeLists.txt
|
||||
@@ -424,7 +424,7 @@ if (${BUILD_GEOCODER} STREQUAL "ON")
|
||||
endif ()
|
||||
|
||||
# Build a shared library (with -fPIC).
|
||||
-set (BUILD_SHARED_LIB true)
|
||||
+set (BUILD_SHARED_LIB false)
|
||||
|
||||
if (${USE_RE2} STREQUAL "ON")
|
||||
# RE2 is not always available as a shared library (e.g: package provided by
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "libphonenumber",
|
||||
"version": "8.13.1",
|
||||
"port-version": 1,
|
||||
"version": "8.13.7",
|
||||
"description": "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.",
|
||||
"license": "Apache-2.0",
|
||||
"supports": "!linux & !osx",
|
||||
|
@ -4281,8 +4281,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"libphonenumber": {
|
||||
"baseline": "8.13.1",
|
||||
"port-version": 1
|
||||
"baseline": "8.13.7",
|
||||
"port-version": 0
|
||||
},
|
||||
"libplist": {
|
||||
"baseline": "1.3.6",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "8384c5dbad4f7fc159e2e01ebcc1d3202157d963",
|
||||
"version": "8.13.7",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "1576e79acd6565aa0213fdd3d4839a7575fd16a8",
|
||||
"version": "8.13.1",
|
||||
|
Loading…
Reference in New Issue
Block a user