Remove included SQLite3

minetest · Jan 8, 2015 · a3db918 · a3db918
1 parent d8cf64a
commit a3db918
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 159,298 deletions.
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
@@ -2,12 +2,6 @@
 
 set(IRRLICHT_SOURCE_DIR "" CACHE PATH "Path to irrlicht source directory (optional)")
 
-if( UNIX )
-	# Unix
-else( UNIX )
-	# Windows
-endif( UNIX )
-
 # Find include directory
 
 if(NOT IRRLICHT_SOURCE_DIR STREQUAL "")
@@ -82,7 +76,7 @@ endif(WIN32)
 # handle the QUIETLY and REQUIRED arguments and set IRRLICHT_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(IRRLICHT DEFAULT_MSG IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Irrlicht DEFAULT_MSG IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR)
 
 IF(IRRLICHT_FOUND)
   SET(IRRLICHT_LIBRARIES ${IRRLICHT_LIBRARY})

diff --git a/cmake/Modules/FindSQLite3.cmake b/cmake/Modules/FindSQLite3.cmake
@@ -0,0 +1,9 @@
+mark_as_advanced(SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR) 
+
+find_path(SQLITE3_INCLUDE_DIR sqlite3.h)
+
+find_library(SQLITE3_LIBRARY NAMES sqlite3)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SQLite3 DEFAULT_MSG SQLITE3_LIBRARY SQLITE3_INCLUDE_DIR)
+
diff --git a/cmake/Modules/FindSqlite3.cmake b/cmake/Modules/FindSqlite3.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -6,8 +6,6 @@ INCLUDE(CheckIncludeFiles)
 
 # Set some random things default to not being visible in the GUI
 mark_as_advanced(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH)
-mark_as_advanced(SQLITE3_INCLUDE_DIR SQLITE3_LIBRARY)
-mark_as_advanced(JSON_INCLUDE_DIR JSON_LIBRARY)
 
 option(ENABLE_CURL "Enable cURL support for fetching media" 1)
 
@@ -174,7 +172,7 @@ else()
 	set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
 endif()
 
-find_package(Sqlite3 REQUIRED)
+find_package(SQLite3 REQUIRED)
 find_package(Json REQUIRED)
 
 option(ENABLE_GLES "Enable OpenGL ES support" 0)
@@ -772,11 +770,6 @@ endif(USE_GETTEXT)
 
 # Subdirectories
 
-if (SQLITE3_FOUND)
-else (SQLITE3_FOUND)
-	add_subdirectory(sqlite)
-endif (SQLITE3_FOUND)
-
 if (BUILD_CLIENT AND USE_FREETYPE)
 	add_subdirectory(cguittfont)
 endif (BUILD_CLIENT AND USE_FREETYPE)

diff --git a/src/sqlite/CMakeLists.txt b/src/sqlite/CMakeLists.txt