]> granicus.if.org Git - graphviz/commitdiff
CMake: stop configuring CMAKE_INCLUDE_PATH
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Thu, 25 Nov 2021 15:39:05 +0000 (07:39 -0800)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Thu, 2 Dec 2021 15:47:07 +0000 (07:47 -0800)
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
CMakeLists.txt

index 9105fca5edc79bc5559e5e0271e9283a6609eeb1..d35708f12d0e61cad00209c460a58d65735be7d6 100644 (file)
@@ -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
 
index bc599bc46248108fc54f8b31783fe5d070de8e82..025052bc853323d04483e56a7be0d402fb12f08b 100644 (file)
@@ -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)