diff options
| author |  Rolf Eike Beer <eike@sf-mail.de> | 2019-03-20 00:10:59 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-03-21 19:30:14 -0700 |
| commit | 3b3306c552c89196da60fbbc70b7a7e50e81f541 (patch) | |
| tree | 06df235dffa072e677ad430e122ba26a31005e64 | |
| parent | c1f88ddd6988fa0ef1171a141120a8989de48960 (diff) | |
| download | subsurface-3b3306c552c89196da60fbbc70b7a7e50e81f541.tar.gz | |
CMake: clean up hints for finding libraries
HINTS should be dynamically introspected, static entries should be in PATHS.
There is also a platform dependent list of things where CMake always looks if
not explicitely forbidden, so remove any entries that are usually in those
default lists.
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
| -rw-r--r-- | cmake/Modules/FindLIBGIT2.cmake | 4 | ||||
| -rw-r--r-- | cmake/Modules/FindLibdivecomputer.cmake | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/cmake/Modules/FindLIBGIT2.cmake b/cmake/Modules/FindLIBGIT2.cmake index e6354ab73..87abb7f47 100644 --- a/cmake/Modules/FindLIBGIT2.cmake +++ b/cmake/Modules/FindLIBGIT2.cmake @@ -18,8 +18,6 @@ NAMES git2.h HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/include ${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/include - /usr/local/include - /usr/include ) IF ( LIBGIT2_DYNAMIC ) @@ -34,8 +32,6 @@ NAMES HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib ${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/build - /usr/local/include - /usr/include ) if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") SET(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES}) diff --git a/cmake/Modules/FindLibdivecomputer.cmake b/cmake/Modules/FindLibdivecomputer.cmake index 60c20ebc1..bc45a52ca 100644 --- a/cmake/Modules/FindLibdivecomputer.cmake +++ b/cmake/Modules/FindLibdivecomputer.cmake @@ -20,8 +20,7 @@ NAMES HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/include ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/ - /usr/local/include - /usr/include +PATHS /opt/out/include ) @@ -32,8 +31,7 @@ NAMES HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/src/.libs/ - /usr/local/lib - /usr/lib +PATHS /opt/out/lib ) |