aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--cmake/FindLibEV.cmake18
2 files changed, 12 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f9e2d2..bfc7ed4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,9 +26,9 @@ find_package (LibEV REQUIRED)
pkg_check_modules (ncursesw ncursesw)
set (project_libraries ${dependencies_LIBRARIES}
- ${libssl_LIBRARIES} ${LIBEV_LIBRARIES})
+ ${libssl_LIBRARIES} ${LibEV_LIBRARIES})
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
find_library (iconv_LIBRARIES iconv)
diff --git a/cmake/FindLibEV.cmake b/cmake/FindLibEV.cmake
index 73787a1..84dff36 100644
--- a/cmake/FindLibEV.cmake
+++ b/cmake/FindLibEV.cmake
@@ -5,14 +5,16 @@
# Some distributions do add it, though
find_package (PkgConfig REQUIRED)
-pkg_check_modules (LIBEV QUIET libev)
+pkg_check_modules (LibEV QUIET libev)
-if (NOT LIBEV_FOUND)
- find_path (LIBEV_INCLUDE_DIRS ev.h)
- find_library (LIBEV_LIBRARIES NAMES ev)
+set (required_vars LibEV_LIBRARIES)
+if (NOT LibEV_FOUND)
+ 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)
- set (LIBEV_FOUND TRUE)
- endif (LIBEV_INCLUDE_DIRS AND LIBEV_LIBRARIES)
-endif (NOT LIBEV_FOUND)
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (LibEV DEFAULT_MSG ${required_vars})
+mark_as_advanced (LibEV_LIBRARIES LibEV_INCLUDE_DIRS)