database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Added the support for pkgconf when finding system thrift

Browse Source 
as fedora uses pkgconf to help locate the thrift files during
compilation instead of a Thrift.cmake file. I have added this logic in
such a way that the existing logic should not be affected. Therefore
enabling the use of system thrift even without pkgconf.
This commit is contained in:
Pavol Sloboda
2025-07-16 10:42:08 +02:00
committed by Leonid Fedorov
parent ee3830f459
commit d0ee5dae32
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/thrift.cmake
View File

@ -12,7 +12,17 @@ if(WITH_THRIFT STREQUAL "system" OR WITH_THRIFT STREQUAL "auto")
set(THRIFT_LIBRARY "${THRIFT_LIBRARIES}") set(THRIFT_LIBRARY "${THRIFT_LIBRARIES}")
return() return()
elseif(WITH_THRIFT STREQUAL "system") elseif(WITH_THRIFT STREQUAL "system")
message(FATAL_ERROR "System Thrift requested but not found!") FIND_PACKAGE(PkgConfig REQUIRED)
pkg_check_modules(THRIFT REQUIRED thrift)
if(THRIFT_FOUND)
add_custom_target(external_thrift)
set(THRIFT_INCLUDE_DIR "${THRIFT_INCLUDE_DIR}")
set(THRIFT_LIBRARY "${THRIFT_LIBRARIES}")
return()
else()
message(FATAL_ERROR "System Thrift requested but not found!")
endif()
endif() endif()
endif() endif()