mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 12:19:08 +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>
39 lines
1.0 KiB
Diff
39 lines
1.0 KiB
Diff
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
|