From 0d82aaf5866b954ab0fe4831df499a4713eeae35 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 5 Jul 2019 12:19:13 +0200 Subject: build: FindLibIntl: fix warning about CMP0075 (#10427) * build: FindLibIntl: fix warning about CMP0075 The common pattern elsewhere to set this only during the check, and here it was not unset, resulting in a warning later (on Alpine 3.10): -- Found Iconv -- Looking for pthread.h CMake Warning (dev) at /usr/share/cmake/Modules/CheckIncludeFile.cmake:80 (message): Policy CMP0075 is not set: Include file check macros honor CMAKE_REQUIRED_LIBRARIES. Run "cmake --help-policy CMP0075" for policy details. Use the cmake_policy command to set the policy and suppress this warning. CMAKE_REQUIRED_LIBRARIES is set to: /usr/lib/libintl.so For compatibility with CMake 3.11 and below this check is ignoring it. Call Stack (most recent call first): /usr/share/cmake/Modules/FindThreads.cmake:105 (CHECK_INCLUDE_FILE) CMakeLists.txt:482 (find_package) This warning is for project developers. Use -Wno-dev to suppress it. -- Looking for pthread.h - found * build: remove lists / REMOVE_ITEM around check_c_source_compiles --- cmake/FindLibIntl.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'cmake/FindLibIntl.cmake') diff --git a/cmake/FindLibIntl.cmake b/cmake/FindLibIntl.cmake index 989cb07488..5663098147 100644 --- a/cmake/FindLibIntl.cmake +++ b/cmake/FindLibIntl.cmake @@ -31,15 +31,13 @@ find_library(LibIntl_LIBRARY ) if (LibIntl_INCLUDE_DIR) - set(CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}") + list(APPEND CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}") endif() - # On some systems (linux+glibc) libintl is passively available. # So only specify the library if one was found. if (LibIntl_LIBRARY) - set(CMAKE_REQUIRED_LIBRARIES "${LibIntl_LIBRARY}") + list(APPEND CMAKE_REQUIRED_LIBRARIES "${LibIntl_LIBRARY}") endif() - check_c_source_compiles(" #include @@ -50,6 +48,12 @@ int main(int argc, char** argv) { bind_textdomain_codeset(\"foo\", \"bar\"); textdomain(\"foo\"); }" HAVE_WORKING_LIBINTL) +if (LibIntl_INCLUDE_DIR) + list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}") +endif() +if (LibIntl_LIBRARY) + list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "${LibIntl_LIBRARY}") +endif() if (HAVE_WORKING_LIBINTL) # On some systems (linux+glibc) libintl is passively available. -- cgit