[PATCH] D88068: [CMake] Use append for CMAKE_REQUIRED_* variables

[Petr Hosek via Phabricator via llvm-commits]

phosek created this revision.
phosek added reviewers: smeenai, leonardchan.
Herald added subscribers: llvm-commits, mgorny.
Herald added a project: LLVM.
phosek requested review of this revision.

This ensures that required includes and libraries such as -lm that
were added earlier aren't overwritten.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D88068

Files:
  llvm/cmake/config-ix.cmake


Index: llvm/cmake/config-ix.cmake
===================================================================
--- llvm/cmake/config-ix.cmake
+++ llvm/cmake/config-ix.cmake
@@ -126,8 +126,8 @@
     # 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 @@
     # 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)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D88068.293340.patch
Type: text/x-patch
Size: 1368 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200922/aa9a658e/attachment.bin>