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