mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 06:38:59 +08:00
8e3fbf662a
* Adding libphonenumber port, pushing changes to get help on error * Added patches to cmake file to work with vcpkg, still facing error & pushing to share code * Added patch to not build shared libs in order to bypass ninja error. Debug build failing so building release only. Pushing for help. * Fixing irregular format vcpkg.json for libphonenumber * Add fix to re2 dependency, and only building release * Fixed debugs builds by turning geocoder off, fixed icu link problems in static builds, and added support for re2 * Skipping linux and osx builds as well as debug builds for x64 static triplets due to time. * Fixing port to incorporate reviews on the PR * Removing changes to triplets * Resolving validate version files by overwriting * Adding changes to address reviews on patches & triplets, add protobuf lite use, and cleaning up code * Resolving validate version files by overwriting * Addressing reviews on dirent and shared lib * Making test lib builds optional and OFF by default * Resolving validate version files by overwriting * Update vcpkg.json to include license Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Reviewing github bot's messages * Reviewing github bot's messages * Making building tests false as temp solution. * Reviewing github bot's messages Co-authored-by: Trish Lam <trishlam@microsoft.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
14 lines
675 B
Diff
14 lines
675 B
Diff
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
|
index 82cf898..07d3f62 100644
|
|
--- a/cpp/CMakeLists.txt
|
|
+++ b/cpp/CMakeLists.txt
|
|
@@ -149,7 +149,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")
|
|
- 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)
|
|
list (APPEND ICU_INCLUDE_DIR ${ICU_I18N_INCLUDE_DIR})
|
|
list (APPEND ICU_LIB ${ICU_I18N_LIB})
|