From 3646fa5c6baf47e1c0713ccafc997f8bc87adaae Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 7 Jul 2016 00:41:44 +0800 Subject: [PATCH] cmake: use the stock FindEXPAT.cmake Signed-off-by: Kefu Chai --- CMakeLists.txt | 2 +- cmake/modules/Findexpat.cmake | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 cmake/modules/Findexpat.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f549600f52c0..3f3b095f960d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 index 9c76f437454a8..0000000000000 --- a/cmake/modules/Findexpat.cmake +++ /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) - -- 2.39.5