diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-25 14:20:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-25 14:20:38 (GMT) |
| commit | 2c36dabbeef72e2d9c9697e6dcc5c67fd0a912dd (patch) | |
| tree | 283a7100ad84e4b25f84fcd9ac808b972da42736 | |
| parent | e9ec0cc3bb9ee2a03cdf2ad45712ea41cc8fac81 (diff) | |
| parent | 889033b5c6847cf1f7bd789384405d59dc333bf6 (diff) | |
| download | CMake-2c36dabbeef72e2d9c9697e6dcc5c67fd0a912dd.zip CMake-2c36dabbeef72e2d9c9697e6dcc5c67fd0a912dd.tar.gz CMake-2c36dabbeef72e2d9c9697e6dcc5c67fd0a912dd.tar.bz2 | |
Merge topic 'libuv-new-version-file-location'
889033b5c6 FindLibUV: Also check uv/version.h for version detection
Acked-by: Kitware Robot <kwrobot@kitware.com>
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 ba13d75..0554d62 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() |