From 800fa38a31b8dea6856918777d214b16018b4d81 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Thu, 25 Nov 2021 07:39:05 -0800 Subject: [PATCH] CMake: stop configuring CMAKE_INCLUDE_PATH MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This variable affects `find_file` and `find_path`.¹ `find_file` is not used in Graphviz and `find_path` already defaults to the correct values for the current platform.² This change avoids, among other things, hard-coding of the target architecture as x86-64. Related to #1973. ¹ see https://cmake.org/cmake/help/latest/variable/CMAKE_INCLUDE_PATH.html#variable:CMAKE_INCLUDE_PATH ² https://cmake.org/cmake/help/latest/command/find_path.html#command:find_path --- CHANGELOG.md | 2 ++ CMakeLists.txt | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9105fca5e..d35708f12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - MD5 checksums of release artifacts are no longer provided. SHA256 checksums are still provided and these should be used instead. - when cross-compiling, the `dot -c` is no longer run during installation +- `$CMAKE_INCLUDE_PATH` is no longer manually configured in the CMake build + system ### Fixed diff --git a/CMakeLists.txt b/CMakeLists.txt index bc599bc46..025052bc8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,8 +94,6 @@ if(WIN32) list(APPEND CMAKE_PREFIX_PATH ${WINDOWS_DEPENDENCY_DIR}) list(APPEND CMAKE_PREFIX_PATH ${WINDOWS_DEPENDENCY_VCPKG_DIR}) endif() -else() - list(APPEND CMAKE_INCLUDE_PATH /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu) endif() find_package(ANN) -- 2.40.0