FindLibEV.cmake: synchronise
This commit is contained in:
parent
87a644cc59
commit
4795ee851d
|
@ -26,9 +26,9 @@ find_package (LibEV REQUIRED)
|
||||||
pkg_check_modules (ncursesw ncursesw)
|
pkg_check_modules (ncursesw ncursesw)
|
||||||
|
|
||||||
set (project_libraries ${dependencies_LIBRARIES}
|
set (project_libraries ${dependencies_LIBRARIES}
|
||||||
${libssl_LIBRARIES} ${LIBEV_LIBRARIES})
|
${libssl_LIBRARIES} ${LibEV_LIBRARIES})
|
||||||
include_directories (${dependencies_INCLUDE_DIRS}
|
include_directories (${dependencies_INCLUDE_DIRS}
|
||||||
${libssl_INCLUDE_DIRS} ${LIBEV_INCLUDE_DIRS})
|
${libssl_INCLUDE_DIRS} ${LibEV_INCLUDE_DIRS})
|
||||||
|
|
||||||
# -liconv may or may not be a part of libc
|
# -liconv may or may not be a part of libc
|
||||||
find_library (iconv_LIBRARIES iconv)
|
find_library (iconv_LIBRARIES iconv)
|
||||||
|
|
|
@ -5,14 +5,16 @@
|
||||||
|
|
||||||
# Some distributions do add it, though
|
# Some distributions do add it, though
|
||||||
find_package (PkgConfig REQUIRED)
|
find_package (PkgConfig REQUIRED)
|
||||||
pkg_check_modules (LIBEV QUIET libev)
|
pkg_check_modules (LibEV QUIET libev)
|
||||||
|
|
||||||
if (NOT LIBEV_FOUND)
|
set (required_vars LibEV_LIBRARIES)
|
||||||
find_path (LIBEV_INCLUDE_DIRS ev.h)
|
if (NOT LibEV_FOUND)
|
||||||
find_library (LIBEV_LIBRARIES NAMES ev)
|
find_path (LibEV_INCLUDE_DIRS ev.h)
|
||||||
|
find_library (LibEV_LIBRARIES NAMES ev)
|
||||||
|
list (APPEND required_vars LibEV_INCLUDE_DIRS)
|
||||||
|
endif ()
|
||||||
|
|
||||||
if (LIBEV_INCLUDE_DIRS AND LIBEV_LIBRARIES)
|
include (FindPackageHandleStandardArgs)
|
||||||
set (LIBEV_FOUND TRUE)
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS (LibEV DEFAULT_MSG ${required_vars})
|
||||||
endif (LIBEV_INCLUDE_DIRS AND LIBEV_LIBRARIES)
|
|
||||||
endif (NOT LIBEV_FOUND)
|
|
||||||
|
|
||||||
|
mark_as_advanced (LibEV_LIBRARIES LibEV_INCLUDE_DIRS)
|
||||||
|
|
Loading…
Reference in New Issue