ngompa / rpms / cmake

Forked from rpms/cmake 4 years ago
Clone
2576bb
commit 889033b5c6847cf1f7bd789384405d59dc333bf6
2576bb
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
2576bb
Date:   Sat Jun 23 20:30:07 2018 +0200
2576bb
2576bb
    FindLibUV: Also check uv/version.h for version detection
2576bb
    
2576bb
    Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory.
2576bb
    Make FindLibUV aware of the file's new location for configuration to work.
2576bb
2576bb
diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake
2576bb
index ba13d75f8befe247..0554d62c23b0cf6f 100644
2576bb
--- a/Source/Modules/FindLibUV.cmake
2576bb
+++ b/Source/Modules/FindLibUV.cmake
2576bb
@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR)
2576bb
 set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
2576bb
 if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
2576bb
   file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
2576bb
+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
2576bb
+  file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
2576bb
 elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
2576bb
   file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
2576bb
 else()