Browse Source

fix(build): Fix regression in how cmake finds libraries

pull/4688/head
Maxim Biro 8 years ago
parent
commit
b7ef73d401
  1. 6
      cmake/Dependencies.cmake

6
cmake/Dependencies.cmake

@ -60,8 +60,10 @@ function(search_dependency pkg) @@ -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()

Loading…
Cancel
Save