tjh.dev
1diff --git a/cmake/FindJsoncpp.cmake b/cmake/FindJsoncpp.cmake
2index abedf7bb85..d7a52f5c7b 100644
3--- a/cmake/FindJsoncpp.cmake
4+++ b/cmake/FindJsoncpp.cmake
5@@ -16,8 +16,8 @@
6
7 if (NOT TARGET JsonCpp::JsonCpp)
8 find_package(jsoncpp REQUIRED CONFIG)
9- set(JSONCPP_STATIC_LIBS jsoncpp_static)
10- set(JSONCPP_INCLUDE_PATH $<TARGET_PROPERTY:jsoncpp_static,INTERFACE_INCLUDE_DIRECTORIES>)
11+ set(JSONCPP_STATIC_LIBS jsoncpp)
12+ set(JSONCPP_INCLUDE_PATH $<TARGET_PROPERTY:jsoncpp,INTERFACE_INCLUDE_DIRECTORIES>)
13 endif()
14 # set(Jsoncpp_PATH_PREFIXES /usr/local "${Jsoncpp_ROOT}" "$ENV{HOME}")
15 # foreach(prefix ${Jsoncpp_PATH_PREFIXES})
16diff --git a/cmake/FindLibevent.cmake b/cmake/FindLibevent.cmake
17index 354d6f9b99..38aca9534e 100644
18--- a/cmake/FindLibevent.cmake
19+++ b/cmake/FindLibevent.cmake
20@@ -26,16 +26,12 @@
21 endforeach()
22
23 find_path(LIBEVENT_INCLUDE_DIR evhttp.h event.h PATHS ${Libevent_INCLUDE_PATHS})
24-find_library(LIBEVENT_STATIC_LIB NAMES libevent.a libevent_core.a libevent_extra.a PATHS ${Libevent_LIB_PATHS})
25-find_library(LIBEVENT_PTHREAD_STATIC_LIB NAMES libevent_pthreads.a PATHS ${Libevent_LIB_PATHS})
26+find_library(LIBEVENT_STATIC_LIB NAMES libevent.so libevent_core.so libevent_extra.so PATHS ${Libevent_LIB_PATHS})
27+find_library(LIBEVENT_PTHREAD_STATIC_LIB NAMES libevent_pthreads.so PATHS ${Libevent_LIB_PATHS})
28
29-if (LIBEVENT_INCLUDE_DIR AND LIBEVENT_STATIC_LIB AND LIBEVENT_PTHREAD_STATIC_LIB)
30+if (LIBEVENT_INCLUDE_DIR AND LIBEVENT_STATIC_LIB)
31 set(Libevent_FOUND TRUE)
32- add_library(libevent_event_static STATIC IMPORTED)
33- set_target_properties(libevent_event_static PROPERTIES IMPORTED_LOCATION ${LIBEVENT_STATIC_LIB})
34- add_library(libevent_event_pthread STATIC IMPORTED)
35- set_target_properties(libevent_event_pthread PROPERTIES IMPORTED_LOCATION ${LIBEVENT_PTHREAD_STATIC_LIB})
36- set(LIBEVENT_STATIC_LIBS libevent_event_static libevent_event_pthread)
37+ set(LIBEVENT_STATIC_LIBS ${LIBEVENT_STATIC_LIB} ${LIBEVENT_PTHREAD_STATIC_LIB})
38 else ()
39 set(Libevent_FOUND FALSE)
40 endif ()