Merge pull request #7021 from akien-mga/cmake-pugixml

CMake: Fix case in FindPugixml resulting in false negative
dolphin-emu · May 30, 2018 · 9bf5ad1 · 9bf5ad1
2 parents 4bebd52 + d37ccc8
commit 9bf5ad1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMake/FindPugixml.cmake → CMake/Findpugixml.cmake b/CMake/FindPugixml.cmake → CMake/Findpugixml.cmake
@@ -5,7 +5,7 @@ mark_as_advanced(pugixml_INCLUDE_DIRS pugixml_LIBRARIES)
 include(FindPackageHandleStandardArgs)
 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)
   set_target_properties(pugixml PROPERTIES
     IMPORTED_LOCATION "${pugixml_LIBRARIES}"

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