archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 03:11:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

CMake: Fix case in FindPugixml resulting in false negative

Browse source 
As mentioned in GH-6652.
This commit is contained in:
Rémi Verschelde 2018-05-30 07:34:40 +02:00
parent 1825e231a3
commit d37ccc844e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMake/FindPugixml.cmake → CMake/Findpugixml.cmake
View file

@ -5,7 +5,7 @@ mark_as_advanced(pugixml_INCLUDE_DIRS pugixml_LIBRARIES)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(pugixml REQUIRED_VARS pugixml_LIBRARIES pugixml_INCLUDE_DIRS) find_package_handle_standard_args(pugixml REQUIRED_VARS pugixml_LIBRARIES pugixml_INCLUDE_DIRS)
if(Pugixml_FOUND AND NOT TARGET pugixml) if(pugixml_FOUND AND NOT TARGET pugixml)
add_library(pugixml UNKNOWN IMPORTED) add_library(pugixml UNKNOWN IMPORTED)
set_target_properties(pugixml PROPERTIES set_target_properties(pugixml PROPERTIES
IMPORTED_LOCATION "${pugixml_LIBRARIES}" IMPORTED_LOCATION "${pugixml_LIBRARIES}"

4
CMakeLists.txt
View file

@ -529,8 +529,8 @@ add_subdirectory(Externals/Bochs_disasm)
add_subdirectory(Externals/cpp-optparse) add_subdirectory(Externals/cpp-optparse)
add_subdirectory(Externals/glslang) add_subdirectory(Externals/glslang)
find_package(Pugixml) find_package(pugixml)
if(NOT Pugixml_FOUND) if(NOT pugixml_FOUND)
message(STATUS "Using static pugixml from Externals") message(STATUS "Using static pugixml from Externals")
add_subdirectory(Externals/pugixml) add_subdirectory(Externals/pugixml)
endif() endif()