projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
80b3a14
)
cmake: fix manual library discovery
author
Michael Wallner
<mike@php.net>
Mon, 30 Nov 2020 14:36:42 +0000
(15:36 +0100)
committer
Michael Wallner
<mike@php.net>
Mon, 30 Nov 2020 14:36:42 +0000
(15:36 +0100)
CMake/CheckDependency.cmake
patch
|
blob
|
history
diff --git
a/CMake/CheckDependency.cmake
b/CMake/CheckDependency.cmake
index eec8d9b3a80fede9735a02ba618df9f4ae83bd56..7932b55a3c9783f1f7a2747b32324687c7a37ada 100644
(file)
--- a/
CMake/CheckDependency.cmake
+++ b/
CMake/CheckDependency.cmake
@@
-17,14
+17,14
@@
function(check_dependency NAME LIB)
endif()
message(STATUS "Checking for library '${LIB}' ...")
endif()
message(STATUS "Checking for library '${LIB}' ...")
- find_library(${NAME}_
FOUND NAMES ${LIB} ${ARGN
})
- if(${NAME}_
FOUND
)
- mark_as_advanced(${NAME}_
FOUND
)
- message(STATUS " Found '${${NAME}_
FOUND
}'")
+ find_library(${NAME}_
LIB NAMES ${LIB
})
+ if(${NAME}_
LIB
)
+ mark_as_advanced(${NAME}_
LIB
)
+ message(STATUS " Found '${${NAME}_
LIB
}'")
set(${NAME}_INCLUDES "")
foreach(PATH IN_LIST CMAKE_PREFIX_PATHS)
set(${NAME}_INCLUDES "")
foreach(PATH IN_LIST CMAKE_PREFIX_PATHS)
- if(
LIB${LIB}
MATCHES "^${PATH}")
+ if(
${NAME}_LIB
MATCHES "^${PATH}")
set(${NAME}_INCLUDES "${PATH}/include")
break()
endif()
set(${NAME}_INCLUDES "${PATH}/include")
break()
endif()
@@
-33,7
+33,7
@@
function(check_dependency NAME LIB)
add_library(Imported::${NAME} INTERFACE IMPORTED)
set_target_properties(Imported::${NAME} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${${NAME}_INCLUDES}"
add_library(Imported::${NAME} INTERFACE IMPORTED)
set_target_properties(Imported::${NAME} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${${NAME}_INCLUDES}"
- INTERFACE_LINK_LIBRARIES ${${NAME}_
FOUND
})
+ INTERFACE_LINK_LIBRARIES ${${NAME}_
LIB
})
set(${NAME} Imported::${NAME} CACHE INTERNAL "${NAME} import target")
set(${HAVE} 1 CACHE INTERNAL "${HAVE}")
set(${NAME} Imported::${NAME} CACHE INTERNAL "${NAME} import target")
set(${HAVE} 1 CACHE INTERNAL "${HAVE}")