diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2018-06-23 20:30:07 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-25 10:16:46 -0400 |
| commit | 889033b5c6847cf1f7bd789384405d59dc333bf6 (patch) | |
| tree | 46c3049ddc6d347242555d6db8ccbc8a929febbb | |
| parent | ef5e2e8a62982ebccf4883fc7a01cdb66f8ca183 (diff) | |
| download | cmake-889033b5c6847cf1f7bd789384405d59dc333bf6.tar.gz | |
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.
| -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() |