RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-18 09:09:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[CMake] Use append for CMAKE_REQUIRED_* variables

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

Differential Revision: https://reviews.llvm.org/D88068
This commit is contained in:
Petr Hosek 2020-09-21 22:31:05 -07:00
parent 48dbca491d
commit a5cf3ea613
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/config-ix.cmake
View File

@ -126,8 +126,8 @@ if(LLVM_ENABLE_ZLIB)
# Check if zlib we found is usable; for example, we may have found a 32-bit # 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. # library on a 64-bit system which would result in a link-time failure.
cmake_push_check_state() cmake_push_check_state()
set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIRS}) list(APPEND CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARY}) list(APPEND CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARY})
check_symbol_exists(compress2 zlib.h HAVE_ZLIB) check_symbol_exists(compress2 zlib.h HAVE_ZLIB)
cmake_pop_check_state() cmake_pop_check_state()
if(LLVM_ENABLE_ZLIB STREQUAL FORCE_ON AND NOT HAVE_ZLIB) 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 # 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. # library on a 64-bit system which would result in a link-time failure.
cmake_push_check_state() cmake_push_check_state()
set(CMAKE_REQUIRED_INCLUDES ${LIBXML2_INCLUDE_DIRS}) list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBXML2_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${LIBXML2_LIBRARIES}) list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBXML2_LIBRARIES})
check_symbol_exists(xmlReadMemory libxml/xmlreader.h HAVE_LIBXML2) check_symbol_exists(xmlReadMemory libxml/xmlreader.h HAVE_LIBXML2)
cmake_pop_check_state() cmake_pop_check_state()
if(LLVM_ENABLE_LIBXML2 STREQUAL FORCE_ON AND NOT HAVE_LIBXML2) if(LLVM_ENABLE_LIBXML2 STREQUAL FORCE_ON AND NOT HAVE_LIBXML2)