diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-25 10:17:38 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-25 10:17:38 -0400 |
| commit | 7e283acde7454e57a801edc9cb38b5dc0630210d (patch) | |
| tree | 055ad670ceeb8a7a914b74a6856200dbb1183ac5 | |
| parent | 00523ad9c5588065b09e345e3486c15250dc4c19 (diff) | |
| parent | 889033b5c6847cf1f7bd789384405d59dc333bf6 (diff) | |
| download | cmake-7e283acde7454e57a801edc9cb38b5dc0630210d.tar.gz | |
Merge branch 'libuv-new-version-file-location' into release-3.12
Merge-request: !2169
| -rw-r--r-- | Source/Modules/FindLibUV.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake index ba13d75f8b..0554d62c23 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() |