]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: use the stock FindEXPAT.cmake
authorKefu Chai <kchai@redhat.com>
Wed, 6 Jul 2016 16:41:44 +0000 (00:41 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 7 Jul 2016 15:26:02 +0000 (23:26 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
CMakeLists.txt
cmake/modules/Findexpat.cmake [deleted file]

index 9f549600f52c0189ed4ee3d343885712fa2b3666..3f3b095f960d4bb979c38852f1532d1d93f73cc5 100644 (file)
@@ -218,7 +218,7 @@ endif(${WITH_LEVELDB})
 
 option(WITH_EXPAT "EXPAT is here" ON)
 if(${WITH_EXPAT})
-find_package(expat REQUIRED)
+find_package(EXPAT REQUIRED)
 endif(${WITH_EXPAT})
 
 find_package(Cython REQUIRED)
diff --git a/cmake/modules/Findexpat.cmake b/cmake/modules/Findexpat.cmake
deleted file mode 100644 (file)
index 9c76f43..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# - Find expat
-# Find the native EXPAT headers and libraries.
-#
-#  EXPAT_INCLUDE_DIRS - where to find expat.h, etc.
-#  EXPAT_LIBRARIES    - List of libraries when using expat.
-#  EXPAT_FOUND        - True if expat found.
-
-# Look for the header file.
-FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h)
-
-# Look for the library.
-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)
-
-# Copy the results to the output variables.
-IF(EXPAT_FOUND)
-  SET(EXPAT_LIBRARIES ${EXPAT_LIBRARY})
-  SET(EXPAT_INCLUDE_DIRS ${EXPAT_INCLUDE_DIR})
-ELSE(EXPAT_FOUND)
-  SET(EXPAT_LIBRARIES)
-  SET(EXPAT_INCLUDE_DIRS)
-ENDIF(EXPAT_FOUND)
-
-MARK_AS_ADVANCED(EXPAT_INCLUDE_DIR EXPAT_LIBRARY)
-