Merge pull request #4673 from Orphis/cmake_checklib

cmake: Only use include directories on actual paths in check_lib
This commit is contained in:
Matthew Parlane 2017-01-18 08:38:03 +13:00 committed by GitHub
commit e7b9d0caa7
1 changed files with 6 additions and 2 deletions

View File

@ -26,10 +26,14 @@ macro(check_lib var pc lib)
endif() endif()
if(${var}_FOUND) if(${var}_FOUND)
if(${var}_INCLUDE_DIRS)
include_directories(${${var}_INCLUDE_DIRS}) include_directories(${${var}_INCLUDE_DIRS})
endif()
# Make sure include directories for headers found using find_path below # Make sure include directories for headers found using find_path below
# are re-added when reconfiguring # are re-added when reconfiguring
if(${var}_INCLUDE)
include_directories(${${var}_INCLUDE}) include_directories(${${var}_INCLUDE})
endif()
_internal_message("${lib} found") _internal_message("${lib} found")
else() else()
find_library(${var} ${lib}) find_library(${var} ${lib})