From fa65fded5bec0258835be62c385bff4b267e1a05 Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Tue, 3 Aug 2021 23:16:06 +0530 Subject: [PATCH] cmake: Remove duplicate SQLite module Signed-off-by: Soumya Koduri --- cmake/modules/FindSQLITE3.cmake | 38 --------------------- src/rgw/store/dbstore/sqlite/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 cmake/modules/FindSQLITE3.cmake diff --git a/cmake/modules/FindSQLITE3.cmake b/cmake/modules/FindSQLITE3.cmake deleted file mode 100644 index b75639cd63315..0000000000000 --- a/cmake/modules/FindSQLITE3.cmake +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2007-2009 LuaDist. -# Created by Peter Kapec -# Redistribution and use of this file is allowed according to the terms of the MIT license. -# For details see the COPYRIGHT file distributed with LuaDist. -# Note: -# Searching headers and libraries is very simple and is NOT as powerful as scripts -# distributed with CMake, because LuaDist defines directories to search for. -# Everyone is encouraged to contact the author with improvements. Maybe this file -# becomes part of CMake distribution sometimes. - -# - Find sqlite3 -# Find the native SQLITE3 headers and libraries. -# -# SQLITE3_INCLUDE_DIRS - where to find sqlite3.h, etc. -# SQLITE3_LIBRARIES - List of libraries when using sqlite. -# SQLITE3_FOUND - True if sqlite found. - -# Look for the header file. -FIND_PATH(SQLITE3_INCLUDE_DIR NAMES sqlite3.h) - -# Look for the library. -FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite sqlite3) - -# Handle the QUIETLY and REQUIRED arguments and set SQLITE3_FOUND to TRUE if all listed variables are TRUE. -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SQLITE3 - REQUIRED_VARS SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR - FAIL_MESSAGE "Could not find sqlite3.h and/or libsqlite3.so") -# Copy the results to the output variables. -IF(SQLITE3_FOUND) - SET(SQLITE3_LIBRARIES ${SQLITE3_LIBRARY}) - SET(SQLITE3_INCLUDE_DIRS ${SQLITE3_INCLUDE_DIR}) -ELSE(SQLITE3_FOUND) - SET(SQLITE3_LIBRARIES) - SET(SQLITE3_INCLUDE_DIRS) -ENDIF(SQLITE3_FOUND) - -MARK_AS_ADVANCED(SQLITE3_INCLUDE_DIRS SQLITE3_LIBRARIES) diff --git a/src/rgw/store/dbstore/sqlite/CMakeLists.txt b/src/rgw/store/dbstore/sqlite/CMakeLists.txt index 02fdc260f947a..bad29bccfd2d6 100644 --- a/src/rgw/store/dbstore/sqlite/CMakeLists.txt +++ b/src/rgw/store/dbstore/sqlite/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.14.0) project(sqlite_db) -find_package(SQLITE3 REQUIRED) +find_package(SQLite3 REQUIRED) set(sqlite_db_srcs sqliteDB.h -- 2.39.5