chore: fix cmake modules

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
zhaojh329 · Sep 6, 2021 · 20d67a4 · 20d67a4
1 parent e60f93c
commit 20d67a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmake/Modules/FindLibev.cmake b/cmake/Modules/FindLibev.cmake
@@ -4,7 +4,7 @@
 #  LIBEV_INCLUDE_DIR    - The libev include directories
 #  LIBEV_LIBRARY        - The libraries needed to use libev
 
-find_path(LIBEV_INCLUDE_DIR ev.h PATH_SUFFIXES libev)
+find_path(LIBEV_INCLUDE_DIR ev.h)
 find_library(LIBEV_LIBRARY ev PATH_SUFFIXES lib64)
 
 if(LIBEV_INCLUDE_DIR)

diff --git a/cmake/Modules/FindLibuhttpd.cmake b/cmake/Modules/FindLibuhttpd.cmake
@@ -4,9 +4,11 @@
 #  LIBUHTTPD_INCLUDE_DIR    - The libuhttpd include directories
 #  LIBUHTTPD_LIBRARY        - The libraries needed to use libuhttpd
 
-find_path(LIBUHTTPD_INCLUDE_DIR uhttpd)
+find_path(LIBUHTTPD_INCLUDE_DIR uhttpd.h PATH_SUFFIXES include/uhttpd)
 find_library(LIBUHTTPD_LIBRARY uhttpd PATH_SUFFIXES lib64)
 
+string(REGEX REPLACE "uhttpd" "" LIBUHTTPD_INCLUDE_DIR "${LIBUHTTPD_INCLUDE_DIR}")
+
 if(LIBUHTTPD_INCLUDE_DIR)
   file(STRINGS "${LIBUHTTPD_INCLUDE_DIR}/uhttpd/config.h"
       LIBUHTTPD_VERSION_MAJOR REGEX "^#define[ \t]+UHTTPD_VERSION_MAJOR[ \t]+[0-9]+")