feat conan: add libpq patch support#1128
Open
vasily-sviridov wants to merge 1 commit intouserver-framework:developfrom
Open
feat conan: add libpq patch support#1128vasily-sviridov wants to merge 1 commit intouserver-framework:developfrom
vasily-sviridov wants to merge 1 commit intouserver-framework:developfrom
Conversation
vasily-sviridov
commented
Feb 25, 2026
Comment on lines
+228
to
+233
| cmake_modules_path = os.path.join(self.source_folder, 'cmake', 'modules') | ||
| existing_module_path = tool_ch.cache_variables.get('CMAKE_MODULE_PATH', '') | ||
| if existing_module_path: | ||
| tool_ch.cache_variables['CMAKE_MODULE_PATH'] = f'{cmake_modules_path};{existing_module_path}' | ||
| else: | ||
| tool_ch.cache_variables['CMAKE_MODULE_PATH'] = cmake_modules_path |
Contributor
Author
There was a problem hiding this comment.
Этот код мне совсем не нравится, мб это в какой-нибудь cmake-файл перенести? Посоветуйте место, пожалуйста.
vasily-sviridov
commented
Feb 25, 2026
Comment on lines
+247
to
+254
| if self.options.with_postgresql_extra: | ||
| libpq = self.dependencies['libpq'] | ||
| libpq_package_folder = libpq.package_folder | ||
|
|
||
| tool_ch.cache_variables['USERVER_PG_SERVER_INCLUDE_DIR'] = os.path.join( | ||
| libpq_package_folder, 'include', 'postgresql', 'server' | ||
| ) | ||
| tool_ch.cache_variables['USERVER_PG_SERVER_LIBRARY_DIR'] = os.path.join(libpq_package_folder, 'lib') |
Contributor
Author
There was a problem hiding this comment.
Не совсем очевидно, как это тестировать в рамках ci. libpq patch требует завендоренной версии libpq
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Проект успешно сконфигурировался: https://pastebin.com/NuU8x1ZQ подтянув openldap и kerberos из conan.
Note: by creating a PR or an issue you automatically agree to the CLA. See CONTRIBUTING.md. Feel free to remove this note, the agreement holds.