projects / packages / libphonenumber.git / blame
| Commit | Line | Data |
|---|---|---|
| 4ded0a69 JB |
1 | --- libphonenumber-8.12.42/tools/cpp/CMakeLists.txt.orig 2022-01-27 15:51:40.000000000 +0100 |
| 2 | +++ libphonenumber-8.12.42/tools/cpp/CMakeLists.txt 2022-02-08 20:53:10.523844007 +0100 | |
| 3 | @@ -26,29 +26,11 @@ project (generate_geocoding_data) | |
| 4 | # Helper functions dealing with finding libraries and programs this library | |
| 5 | # depends on. | |
| 6 | include (gtest.cmake) | |
| 7 | -include (FetchContent) | |
| 8 | - | |
| 9 | -# Downloading the abseil sources. | |
| 10 | -FetchContent_Declare( | |
| 11 | - abseil-cpp | |
| 12 | - GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git | |
| 13 | - GIT_TAG origin/master | |
| 14 | -) | |
| 15 | - | |
| 16 | -# Building the abseil binaries | |
| 17 | -FetchContent_GetProperties(abseil-cpp) | |
| 18 | -if (NOT abseil-cpp_POPULATED) | |
| 19 | - FetchContent_Populate(abseil-cpp) | |
| 20 | -endif () | |
| 21 | - | |
| 22 | -if (NOT abseil-cpp_POPULATED) | |
| 23 | - message (FATAL_ERROR "Could not build abseil-cpp binaries.") | |
| 24 | -endif () | |
| 25 | ||
| 26 | # Safeguarding against any potential link errors as mentioned in | |
| 27 | # https://github.com/abseil/abseil-cpp/issues/225 | |
| 28 | set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) | |
| 29 | -add_subdirectory(${abseil-cpp_SOURCE_DIR} ${abseil-cpp_BINARY_DIR}) | |
| 30 | +find_package(absl REQUIRED COMPONENTS btree strings) | |
| 31 | ||
| 32 | find_or_build_gtest () | |
| 33 | set ( | |
| 5389ffd2 JB |
34 | --- libphonenumber-8.12.49/cpp/CMakeLists.txt.orig 2022-06-05 20:00:44.936971698 +0200 |
| 35 | +++ libphonenumber-8.12.49/cpp/CMakeLists.txt 2022-06-05 20:09:04.854263413 +0200 | |
| 38501573 JB |
36 | @@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 3.11) |
| 37 | ||
| 38 | # Pick the C++ standard to compile with. | |
| 39 | # Abseil currently supports C++11, C++14, and C++17. | |
| 40 | -set(CMAKE_CXX_STANDARD 11) | |
| 41 | +set(CMAKE_CXX_STANDARD 17) | |
| 42 | set(CMAKE_CXX_STANDARD_REQUIRED ON) | |
| 43 | ||
| 44 | project (libphonenumber) | |
| 5389ffd2 JB |
45 | @@ -474,6 +474,7 @@ if (${USE_POSIX_THREAD} STREQUAL "ON" OR |
| 46 | endif() | |
| 47 | endif () | |
| 48 | ||
| 49 | +find_package(absl REQUIRED COMPONENTS node_hash_set strings synchronization) | |
| 50 | # Safeguarding against any potential link errors as mentioned in | |
| 51 | # https://github.com/abseil/abseil-cpp/issues/225 | |
| 52 | set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) |