From a5cf3ea613c2d188c920bf1e0a44d523cefcddc7 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Mon, 21 Sep 2020 22:31:05 -0700 Subject: [PATCH] [CMake] Use append for CMAKE_REQUIRED_* variables This ensures that required includes and libraries such as -lm that were added earlier aren't overwritten. Differential Revision: https://reviews.llvm.org/D88068 --- cmake/config-ix.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index eeaebf31c92..797485e3d02 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -126,8 +126,8 @@ if(LLVM_ENABLE_ZLIB) # Check if zlib we found is usable; for example, we may have found a 32-bit # library on a 64-bit system which would result in a link-time failure. cmake_push_check_state() - set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIRS}) - set(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARY}) + list(APPEND CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIRS}) + list(APPEND CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARY}) check_symbol_exists(compress2 zlib.h HAVE_ZLIB) cmake_pop_check_state() if(LLVM_ENABLE_ZLIB STREQUAL FORCE_ON AND NOT HAVE_ZLIB) @@ -147,8 +147,8 @@ if(LLVM_ENABLE_LIBXML2) # Check if libxml2 we found is usable; for example, we may have found a 32-bit # library on a 64-bit system which would result in a link-time failure. cmake_push_check_state() - set(CMAKE_REQUIRED_INCLUDES ${LIBXML2_INCLUDE_DIRS}) - set(CMAKE_REQUIRED_LIBRARIES ${LIBXML2_LIBRARIES}) + list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBXML2_INCLUDE_DIRS}) + list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBXML2_LIBRARIES}) check_symbol_exists(xmlReadMemory libxml/xmlreader.h HAVE_LIBXML2) cmake_pop_check_state() if(LLVM_ENABLE_LIBXML2 STREQUAL FORCE_ON AND NOT HAVE_LIBXML2)