forked from sailfishos/libphonenumber
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
See: - protocolbuffers/protobuf#12746 (comment) - google/libphonenumber#3215 - google/libphonenumber#3213
- Loading branch information
nephros
committed
Dec 9, 2023
1 parent
b588fb6
commit 4def864
Showing
3 changed files
with
31 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt | ||
index b3ecc4f..7864618 100644 | ||
--- a/cpp/CMakeLists.txt | ||
+++ b/cpp/CMakeLists.txt | ||
@@ -203,7 +203,8 @@ add_custom_command ( | ||
) | ||
|
||
if (${BUILD_GEOCODER} STREQUAL "ON") | ||
- find_package(absl) | ||
+ # Use "CONFIG" as there is no built-in cmake module for absl. | ||
+ find_package(absl CONFIG REQUIRED) | ||
|
||
# Geocoding data cpp file generation | ||
set (TOOLS_DIR "${CMAKE_CURRENT_BINARY_DIR}/tools") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt | ||
index b3ecc4f..a35c680 100644 | ||
--- a/cpp/CMakeLists.txt | ||
+++ b/cpp/CMakeLists.txt | ||
@@ -479,7 +479,7 @@ endif () | ||
# Safeguarding against any potential link errors as mentioned in | ||
# https://github.com/abseil/abseil-cpp/issues/225 | ||
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) | ||
-list (APPEND LIBRARY_DEPS absl::node_hash_set absl::strings absl::synchronization) | ||
+list (APPEND LIBRARY_DEPS absl::node_hash_set absl::strings absl::synchronization absl::log_internal_message absl::log_internal_check_op) | ||
|
||
if (APPLE) | ||
list (APPEND COMMON_DEPS ${COREFOUNDATION_LIB} ${FOUNDATION_LIB}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters