From 2a2ca3292a93c224647c84916c09337ece661b5b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 18 Aug 2022 09:58:17 +1000 Subject: CMake: always unset CMAKE_REQUIRED_* variables after use Always unset these variables after use as they could interfere with other checks made afterwards. --- build_files/cmake/platform/platform_unix.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'build_files/cmake') diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index bfba89d3a13..f18638dfa6b 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -100,8 +100,8 @@ find_package_wrapper(Epoxy REQUIRED) function(check_freetype_for_brotli) include(CheckSymbolExists) set(CMAKE_REQUIRED_INCLUDES ${FREETYPE_INCLUDE_DIRS}) - check_symbol_exists(FT_CONFIG_OPTION_USE_BROTLI - "freetype/config/ftconfig.h" HAVE_BROTLI) + check_symbol_exists(FT_CONFIG_OPTION_USE_BROTLI "freetype/config/ftconfig.h" HAVE_BROTLI) + unset(CMAKE_REQUIRED_INCLUDES) if(NOT HAVE_BROTLI) unset(HAVE_BROTLI CACHE) message(FATAL_ERROR "Freetype needs to be compiled with brotli support!") @@ -957,6 +957,7 @@ function(CONFIGURE_ATOMIC_LIB_IF_NEEDED) set(CMAKE_REQUIRED_LIBRARIES atomic) check_cxx_source_compiles("${_source}" ATOMIC_OPS_WITH_LIBATOMIC) + unset(CMAKE_REQUIRED_LIBRARIES) if(ATOMIC_OPS_WITH_LIBATOMIC) set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -latomic" PARENT_SCOPE) -- cgit v1.2.3