diff options
| author | Daniel Hahler <git@thequod.de> | 2019-07-01 03:32:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 03:32:52 +0200 |
| commit | 740fb337dd8c63b63db186057fca2994b92ddbf5 (patch) | |
| tree | 396e784704566cc53ea773f406a4ccd0251959b6 | |
| parent | 6e06f4795a6bd49a55456208dfec987c0498994b (diff) | |
| download | rneovim-740fb337dd8c63b63db186057fca2994b92ddbf5.tar.gz rneovim-740fb337dd8c63b63db186057fca2994b92ddbf5.tar.bz2 rneovim-740fb337dd8c63b63db186057fca2994b92ddbf5.zip | |
build: fix warning with passively available libintl (#10380)
Since 0364f51 it would display a warning.
| -rw-r--r-- | cmake/FindLibIntl.cmake | 1 | ||||
| -rw-r--r-- | cmake/LibFindMacros.cmake | 16 |
2 files changed, 11 insertions, 6 deletions
diff --git a/cmake/FindLibIntl.cmake b/cmake/FindLibIntl.cmake index 738ae39983..989cb07488 100644 --- a/cmake/FindLibIntl.cmake +++ b/cmake/FindLibIntl.cmake @@ -58,6 +58,7 @@ if (HAVE_WORKING_LIBINTL) if(LibIntl_FIND_REQUIRED) unset(LibIntl_FIND_REQUIRED) endif() + set(LibIntl_FIND_QUIETLY ON) check_variable_exists(_nl_msg_cat_cntr HAVE_NL_MSG_CAT_CNTR) endif() diff --git a/cmake/LibFindMacros.cmake b/cmake/LibFindMacros.cmake index 81fef7d8e7..726a8631f0 100644 --- a/cmake/LibFindMacros.cmake +++ b/cmake/LibFindMacros.cmake @@ -52,6 +52,10 @@ function (libfind_pkg_detect PREFIX) if (libraryargs) find_library(${PREFIX}_LIBRARY NAMES ${libraryargs} HINTS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}) endif() + # Read pkg-config version + if (${PREFIX}_PKGCONF_VERSION) + set(${PREFIX}_VERSION ${${PREFIX}_PKGCONF_VERSION} PARENT_SCOPE) + endif() endfunction() # Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION. @@ -132,7 +136,7 @@ function (libfind_process PREFIX) else() # If plural forms don't exist or they equal singular forms if ((NOT DEFINED ${i}_INCLUDE_DIRS AND NOT DEFINED ${i}_LIBRARIES) OR - ({i}_INCLUDE_DIR STREQUAL ${i}_INCLUDE_DIRS AND ${i}_LIBRARY STREQUAL ${i}_LIBRARIES)) + (${i}_INCLUDE_DIR STREQUAL ${i}_INCLUDE_DIRS AND ${i}_LIBRARY STREQUAL ${i}_LIBRARIES)) # Singular forms can be used if (DEFINED ${i}_INCLUDE_DIR) list(APPEND includeopts ${i}_INCLUDE_DIR) @@ -209,12 +213,12 @@ function (libfind_process PREFIX) message(STATUS " ${PREFIX}_LIBRARY_OPTS=${libraryopts}") message(STATUS " ${PREFIX}_LIBRARIES=${libs}") endif() - set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE) - set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE) - set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE) - set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE) - set (${PREFIX}_FOUND TRUE PARENT_SCOPE) endif() + set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE) + set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE) + set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE) + set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE) + set (${PREFIX}_FOUND TRUE PARENT_SCOPE) return() endif() |