mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

CMake: clean up hints for finding libraries

Browse source 
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>
This commit is contained in:
Rolf Eike Beer 2019-03-20 00:10:59 +01:00 • committed by Dirk Hohndel
parent c1f88ddd69
commit 3b3306c552
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/Modules/FindLIBGIT2.cmake
View file

@ -18,8 +18,6 @@ NAMES git2.h
HINTS HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../install-root/include ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/include
${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/include ${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/include
/usr/local/include
/usr/include
) )
IF ( LIBGIT2_DYNAMIC ) IF ( LIBGIT2_DYNAMIC )
@ -34,8 +32,6 @@ NAMES
HINTS HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib
${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/build ${CMAKE_CURRENT_SOURCE_DIR}/../libgit2/build
/usr/local/include
/usr/include
) )
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
SET(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES}) SET(LIBGIT2_LIBRARIES ${LIBGIT2_LIBRARIES})

6
cmake/Modules/FindLibdivecomputer.cmake
View file

@ -20,8 +20,7 @@ NAMES
HINTS HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../install-root/include ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/include
${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/ ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/include/
/usr/local/include PATHS
/usr/include
/opt/out/include /opt/out/include
) )
@ -32,8 +31,7 @@ NAMES
HINTS HINTS
${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib ${CMAKE_CURRENT_SOURCE_DIR}/../install-root/lib
${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/src/.libs/ ${CMAKE_CURRENT_SOURCE_DIR}/../libdivecomputer/src/.libs/
/usr/local/lib PATHS
/usr/lib
/opt/out/lib /opt/out/lib
) )