Skip to content

Commit 4da539f

Browse files
update build system to use os packages of hiredis and libevent
1 parent 4f536e0 commit 4da539f

5 files changed

Lines changed: 7 additions & 105 deletions

File tree

plugins/helix/CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ option(PL_HELIX "Build the Helix plugin" ON)
33
if(PL_HELIX OR BUILD_ALL_PLUGINS)
44

55
# Dependencies
6-
add_subdirectory(deps)
6+
find_package(PkgConfig REQUIRED)
7+
pkg_check_modules(HIREDIS REQUIRED hiredis)
8+
pkg_check_modules(LIBEVENT REQUIRED libevent)
79
find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
810

911
# Include-What-You-Use (optional)
@@ -30,16 +32,17 @@ if(PL_HELIX OR BUILD_ALL_PLUGINS)
3032
# --- Includes ---
3133
target_include_directories(helix PRIVATE
3234
"${PROJECT_SOURCE_DIR}/plugins/gui/include"
35+
${LIBEVENT_INCLUDE_DIRS}
36+
${HIREDIS_INCLUDE_DIRS}
3337
)
3438

3539
# --- Link Libraries ---
3640
target_link_libraries(helix PRIVATE
3741
Qt5::Core
3842
Qt5::Widgets
3943
pthread
40-
event
41-
event_pthreads
42-
hiredis
44+
${LIBEVENT_LIBRARIES}
45+
${HIREDIS_LIBRARIES}
4346
gui
4447
)
4548

plugins/helix/deps/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

plugins/helix/deps/cmake/get_latest_github_tag.cmake

Lines changed: 0 additions & 16 deletions
This file was deleted.

plugins/helix/deps/hiredis/CMakeLists.txt

Lines changed: 0 additions & 41 deletions
This file was deleted.

plugins/helix/deps/libevent/CMakeLists.txt

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)