From d37ccc844e60d231c7316b53a3bf016e9f4f90a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 30 May 2018 07:34:40 +0200 Subject: [PATCH] CMake: Fix case in FindPugixml resulting in false negative As mentioned in GH-6652. --- CMake/{FindPugixml.cmake => Findpugixml.cmake} | 2 +- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename CMake/{FindPugixml.cmake => Findpugixml.cmake} (92%) diff --git a/CMake/FindPugixml.cmake b/CMake/Findpugixml.cmake similarity index 92% rename from CMake/FindPugixml.cmake rename to CMake/Findpugixml.cmake index 32f504c8b0..e026b8d32d 100644 --- a/CMake/FindPugixml.cmake +++ b/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 index bf43754266..659576256a 100644 --- 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()