Unified Search Architecture Redesign #428
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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,83 @@ | ||
| # Find ICU (International Components for Unicode) | ||
| # This module finds the ICU libraries and defines: | ||
| # ICU_FOUND - True if ICU was found | ||
| # ICU_INCLUDE_DIRS - Include directories for ICU | ||
| # ICU_LIBRARIES - Libraries to link against | ||
| # ICU_VERSION - Version of ICU | ||
|
|
||
| find_package(PkgConfig) | ||
| if(PKG_CONFIG_FOUND) | ||
| pkg_check_modules(ICU_UC icu-uc) | ||
| pkg_check_modules(ICU_I18N icu-i18n) | ||
| endif() | ||
|
|
||
| # If pkg-config didn't find ICU, try manual search | ||
| if(NOT ICU_UC_FOUND) | ||
| find_path(ICU_INCLUDE_DIR | ||
| NAMES unicode/utypes.h | ||
| PATHS | ||
| /usr/include | ||
| /usr/local/include | ||
| /opt/local/include | ||
| ) | ||
|
|
||
| find_library(ICU_UC_LIB | ||
| NAMES icuuc icuucd | ||
| PATHS | ||
| /usr/lib | ||
| /usr/local/lib | ||
| /opt/local/lib | ||
| /usr/lib/x86_64-linux-gnu | ||
| ) | ||
|
|
||
| find_library(ICU_I18N_LIB | ||
| NAMES icui18n icui18nd | ||
| PATHS | ||
| /usr/lib | ||
| /usr/local/lib | ||
| /opt/local/lib | ||
| /usr/lib/x86_64-linux-gnu | ||
| ) | ||
|
|
||
| if(ICU_INCLUDE_DIR AND ICU_UC_LIB AND ICU_I18N_LIB) | ||
| set(ICU_UC_FOUND TRUE) | ||
| set(ICU_I18N_FOUND TRUE) | ||
| set(ICU_UC_INCLUDE_DIRS ${ICU_INCLUDE_DIR}) | ||
| set(ICU_UC_LIBRARIES ${ICU_UC_LIB}) | ||
| set(ICU_I18N_LIBRARIES ${ICU_I18N_LIB}) | ||
| endif() | ||
| endif() | ||
|
|
||
| # Combine results | ||
| if(ICU_UC_FOUND AND ICU_I18N_FOUND) | ||
| set(ICU_FOUND TRUE) | ||
| set(ICU_INCLUDE_DIRS ${ICU_UC_INCLUDE_DIRS}) | ||
| set(ICU_LIBRARIES ${ICU_UC_LIBRARIES} ${ICU_I18N_LIBRARIES}) | ||
|
|
||
| if(DEFINED ICU_UC_VERSION) | ||
| set(ICU_VERSION ${ICU_UC_VERSION}) | ||
| else() | ||
| # Try to get version from header file | ||
| if(EXISTS "${ICU_INCLUDE_DIR}/unicode/uversion.h") | ||
| file(READ "${ICU_INCLUDE_DIR}/unicode/uversion.h" ICU_VERSION_H) | ||
| string(REGEX MATCH "U_ICU_VERSION_MAJOR_NUM ([0-9]+)" _ ${ICU_VERSION_H}) | ||
| set(ICU_VERSION_MAJOR ${CMAKE_MATCH_1}) | ||
| string(REGEX MATCH "U_ICU_VERSION_MINOR_NUM ([0-9]+)" _ ${ICU_VERSION_H}) | ||
| set(ICU_VERSION_MINOR ${CMAKE_MATCH_1}) | ||
| set(ICU_VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}") | ||
| endif() | ||
| endif() | ||
|
|
||
| message(STATUS "Found ICU: ${ICU_INCLUDE_DIRS}, ${ICU_LIBRARIES}") | ||
| message(STATUS "ICU Version: ${ICU_VERSION}") | ||
| else() | ||
| set(ICU_FOUND FALSE) | ||
| message(STATUS "ICU not found, will use wxWidgets encoding fallback") | ||
| endif() | ||
|
|
||
| # Hide cache variables from GUI | ||
| mark_as_advanced( | ||
| ICU_INCLUDE_DIR | ||
| ICU_UC_LIB | ||
| ICU_I18N_LIB | ||
| ) |
This file contains hidden or 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 |
|---|---|---|
| @@ -1,42 +1,65 @@ | ||
| # MaxMind DB implementation for IP2Country | ||
| find_package(maxminddb QUIET) | ||
| if (NOT maxminddb_FOUND) | ||
| # Try alternative spelling | ||
| find_package(MaxMindDB QUIET) | ||
|
Collaborator
There was a problem hiding this comment. Shouldn't be needed as upstream creates maxminddb-config.cmake that's the right spelling, if anyone (any Distro/Packagemanager) renames it, not our problem. |
||
| endif() | ||
|
|
||
| if (maxminddb_FOUND) | ||
| message(STATUS "MaxMind DB found: ${maxminddb_VERSION}") | ||
| else() | ||
| # Try to find manually | ||
| find_path(MAXMINDDB_INCLUDE_DIR maxminddb.h) | ||
| find_library(MAXMINDDB_LIBRARY NAMES maxminddb) | ||
|
|
||
| if (MAXMINDDB_INCLUDE_DIR AND MAXMINDDB_LIBRARY) | ||
| set(maxminddb_FOUND TRUE) | ||
| set(maxminddb_INCLUDE_DIRS ${MAXMINDDB_INCLUDE_DIR}) | ||
| set(maxminddb_LIBRARIES ${MAXMINDDB_LIBRARY}) | ||
|
|
||
| # Get version from pkg-config | ||
| find_package(PkgConfig QUIET) | ||
| if(PKG_CONFIG_FOUND) | ||
| execute_process( | ||
| COMMAND pkg-config --modversion libmaxminddb | ||
| OUTPUT_VARIABLE maxminddb_VERSION | ||
| OUTPUT_STRIP_TRAILING_WHITESPACE | ||
| ERROR_QUIET | ||
| ) | ||
| if(maxminddb_VERSION) | ||
| message(STATUS "MaxMind DB version from pkg-config: ${maxminddb_VERSION}") | ||
| endif() | ||
| endif() | ||
|
|
||
| message(STATUS "MaxMind DB found manually") | ||
| else() | ||
| if (ENABLE_IP2COUNTRY) | ||
| message(FATAL_ERROR "**************************************************") | ||
| message(FATAL_ERROR "libmaxminddb not found but ENABLE_IP2COUNTRY is enabled") | ||
| message(FATAL_ERROR "Please install: sudo apt install libmaxminddb-dev") | ||
|
Collaborator
There was a problem hiding this comment. I doubt this command is portable, just "please install" should be enough |
||
| message(FATAL_ERROR "**************************************************") | ||
| else() | ||
|
Collaborator
There was a problem hiding this comment. As this file isn't even included when ENABLE-IP2COUNTRY is not set, the else branch is never reaches, so the complete if can be omitted. |
||
| message(STATUS "MaxMind DB not found - GeoIP/country flags will be disabled") | ||
| message(STATUS "To enable, install: sudo apt install libmaxminddb-dev") | ||
| set(maxminddb_FOUND FALSE) | ||
| endif() | ||
| endif() | ||
| endif() | ||
|
|
||
| if (ENABLE_IP2COUNTRY) | ||
| if (maxminddb_FOUND) | ||
|
Collaborator
There was a problem hiding this comment. Both if's can be omitted here, as this isn't reached if one of them is false. |
||
| # MaxMind DB implementation | ||
| add_library(maxminddb::maxminddb UNKNOWN IMPORTED) | ||
|
|
||
| set_target_properties(maxminddb::maxminddb PROPERTIES | ||
| INTERFACE_COMPILE_DEFINITIONS "ENABLE_IP2COUNTRY" | ||
| INTERFACE_INCLUDE_DIRECTORIES "${maxminddb_INCLUDE_DIRS}" | ||
| IMPORTED_LOCATION "${maxminddb_LIBRARIES}" | ||
| ) | ||
| message(STATUS "Using MaxMind DB implementation") | ||
| else() | ||
| # No MaxMind DB library found, disable support | ||
| set(ENABLE_IP2COUNTRY FALSE) | ||
| message(STATUS "MaxMind DB not found, disabling IP2Country support") | ||
| endif() | ||
| endif() | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not bumping min version to 3.7 and using FindICU?