From b7ef73d401aabbd0f5ee6ccfcd1a9f0a962bdaab Mon Sep 17 00:00:00 2001 From: Maxim Biro Date: Mon, 25 Sep 2017 05:15:51 -0400 Subject: [PATCH] fix(build): Fix regression in how cmake finds libraries --- cmake/Dependencies.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index c823a14ea..5d063a5e3 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -60,8 +60,10 @@ function(search_dependency pkg) # Last, search for the library itself globally. if(NOT ${pkg}_FOUND AND arg_LIBRARY) find_library(${pkg}_LIBRARIES NAMES ${arg_LIBRARY}) - find_path(${pkg}_INCLUDE_DIRS NAMES ${arg_HEADER}) - if(${pkg}_LIBRARIES AND ${pkg}_INCLUDE_DIRS) + if(arg_HEADER) + find_path(${pkg}_INCLUDE_DIRS NAMES ${arg_HEADER}) + endif() + if(${pkg}_LIBRARIES AND (${pkg}_INCLUDE_DIRS OR NOT arg_HEADER)) set(${pkg}_FOUND TRUE) endif() endif()