From 3b3306c552c89196da60fbbc70b7a7e50e81f541 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Wed, 20 Mar 2019 00:10:59 +0100 Subject: 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 --- cmake/Modules/FindLIBGIT2.cmake | 4 ---- cmake/Modules/FindLibdivecomputer.cmake | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'cmake') 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 ) -- cgit v1.2.3-70-g09d2