From bb94895d52bcc58fb23e1010c9e896b7064b7ca0 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 1 Dec 2018 15:28:33 -0500 Subject: [PATCH 1/2] Unset CMAKE_REQUIRED_* after they're done being used As of CMake 3.12, check_include_files() also link the check executable against the libraries listed in CMAKE_REQUIRED_LIBRARIES. Therefore we should unset the CMAKE_REQUIRED_* variables after each respective use to avoid them unnecessarily bleeding into other checks. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26a6529fcd..527ab5eba4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -389,6 +389,7 @@ main(void) return MSGPACK_OBJECT_FLOAT32; } " MSGPACK_HAS_FLOAT32) +unset(CMAKE_REQUIRED_LIBRARIES) if(MSGPACK_HAS_FLOAT32) add_definitions(-DNVIM_MSGPACK_HAS_FLOAT32) endif() @@ -410,6 +411,8 @@ if(FEAT_TUI) return unibi_num_from_var(unibi_var_from_num(0)); } " UNIBI_HAS_VAR_FROM) + unset(CMAKE_REQUIRED_INCLUDES) + unset(CMAKE_REQUIRED_LIBRARIES) if(UNIBI_HAS_VAR_FROM) add_definitions(-DNVIM_UNIBI_HAS_VAR_FROM) endif() From b14b2883e9e395c4850d8fae17936b43b04fa46c Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 1 Dec 2018 17:55:29 -0500 Subject: [PATCH 2/2] cmake: Update comment on why CMP0059 is still set to OLD --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 527ab5eba4..15718c94cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,10 @@ cmake_minimum_required(VERSION 2.8.12) project(nvim C) if(POLICY CMP0059) - cmake_policy(SET CMP0059 OLD) # Needed until cmake 2.8.12. #4389 + # Needed for use of DEFINITIONS variable, which is used to collect the + # compilation flags for reporting in "nvim --version" + # https://github.com/neovim/neovim/pull/8558#issuecomment-398033140 + cmake_policy(SET CMP0059 OLD) endif() # Point CMake at any custom modules we may ship