From: Daniel Gryniewicz <dang@fprintf.net>
Date: Mon, 21 Sep 2015 15:10:07 +0000 (-0400)
Subject: CMake - fix check for expat
X-Git-Tag: v9.1.0~84^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb7fe458238cd888f9d60897c44968162c8b24d2;p=ceph.git

CMake - fix check for expat

Signed-off-by: Daniel Gryniewicz <dang@fprintf.net>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfed25d4e204..e8f9c15f7bac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,6 @@ CHECK_INCLUDE_FILES("sys/xattr.h" HAVE_SYS_XATTR_H)
 CHECK_INCLUDE_FILES("unistd.h" HAVE_UNISTD_H)
 CHECK_INCLUDE_FILES("utime.h" HAVE_UTIME_H)
 CHECK_INCLUDE_FILES("${CMAKE_SOURCE_DIR}/src/include/fiemap.h" HAVE_FIEMAP_H)
-CHECK_INCLUDE_FILES("expat.h" HAVE_EXPAT_H)
 CHECK_INCLUDE_FILES("fuse/fuse_lowlevel.h" HAVE_FUSE_LOWLEVEL_H)
 CHECK_INCLUDE_FILES("curl/curl.h" HAVE_FUSE_LOWLEVEL_H)
 CHECK_INCLUDE_FILES("fuse/fuse.h" HAVE_FUSE_H)
diff --git a/cmake/modules/Findexpat.cmake b/cmake/modules/Findexpat.cmake
index 951fb25978c7..9c76f437454a 100644
--- a/cmake/modules/Findexpat.cmake
+++ b/cmake/modules/Findexpat.cmake
@@ -14,7 +14,7 @@ FIND_LIBRARY(EXPAT_LIBRARY NAMES expat)
 # handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(EXPAT DEFAULT_MSG EXPAT_LIBRARY EXPAT_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(expat DEFAULT_MSG EXPAT_LIBRARY EXPAT_INCLUDE_DIR)
 
 # Copy the results to the output variables.
 IF(EXPAT_FOUND)