ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Fix cmake reconfigure breaking dependencies 

pkg_search_module was looking at our lib_FOUND and thinking it was its own
Fixed by tracking who found the library and only invoking pkg_search_module if pkg_search_module also found the library the previous time
This commit is contained in:
TellowKrinkle 2021-07-19 22:18:08 -05:00 committed by tellowkrinkle
parent 146f9a766e
commit a13222f926
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/CheckLib.cmake
View File

@ -7,7 +7,7 @@ endmacro()
macro(check_lib var lib) macro(check_lib var lib)
set(_arg_list ${ARGN}) set(_arg_list ${ARGN})
if(PKG_CONFIG_FOUND AND NOT CMAKE_CROSSCOMPILING) if(PKG_CONFIG_FOUND AND NOT CMAKE_CROSSCOMPILING AND NOT DEFINED pcsx2_manually_found_${var})
string(TOLOWER ${lib} lower_lib) string(TOLOWER ${lib} lower_lib)
pkg_search_module(${var} QUIET IMPORTED_TARGET ${lower_lib}) pkg_search_module(${var} QUIET IMPORTED_TARGET ${lower_lib})
endif() endif()
@ -31,6 +31,7 @@ macro(check_lib var lib)
) )
_internal_message("-- ${var} found") _internal_message("-- ${var} found")
set(${var}_FOUND 1 CACHE INTERNAL "") set(${var}_FOUND 1 CACHE INTERNAL "")
set(pcsx2_manually_found_${var} 1 CACHE INTERNAL "")
elseif(${var}_LIBRARIES) elseif(${var}_LIBRARIES)
_internal_message("-- ${var} not found (miss include)") _internal_message("-- ${var} not found (miss include)")
elseif(${var}_INCLUDE) elseif(${var}_INCLUDE)