moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-12-21 23:28:48 -05:00
Code Issues Releases Wiki Activity

Remove included SQLite3

Browse Source
This commit is contained in:
ShadowNinja 2015-01-04 13:48:23 -05:00
parent d8cf64a202
commit a3db918f78
7 changed files with 11 additions and 159298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/Modules/FindIrrlicht.cmake
View File

@ -2,12 +2,6 @@
set(IRRLICHT_SOURCE_DIR "" CACHE PATH "Path to irrlicht source directory (optional)") set(IRRLICHT_SOURCE_DIR "" CACHE PATH "Path to irrlicht source directory (optional)")
if( UNIX )
# Unix
else( UNIX )
# Windows
endif( UNIX )
# Find include directory # Find include directory
if(NOT IRRLICHT_SOURCE_DIR STREQUAL "") 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 # handle the QUIETLY and REQUIRED arguments and set IRRLICHT_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs) 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) IF(IRRLICHT_FOUND)
SET(IRRLICHT_LIBRARIES ${IRRLICHT_LIBRARY}) SET(IRRLICHT_LIBRARIES ${IRRLICHT_LIBRARY})

9
cmake/Modules/FindSQLite3.cmake Normal file
View File

@ -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)

18
cmake/Modules/FindSqlite3.cmake
View File

@ -1,18 +0,0 @@
# Look for sqlite3, use our own if not found
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3)
IF(SQLITE3_LIBRARY AND SQLITE3_INCLUDE_DIR)
SET( SQLITE3_FOUND TRUE )
ENDIF(SQLITE3_LIBRARY AND SQLITE3_INCLUDE_DIR)
IF(SQLITE3_FOUND)
MESSAGE(STATUS "Found system sqlite3 header file in ${SQLITE3_INCLUDE_DIR}")
MESSAGE(STATUS "Found system sqlite3 library ${SQLITE3_LIBRARY}")
ELSE(SQLITE3_FOUND)
SET(SQLITE3_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/sqlite)
SET(SQLITE3_LIBRARY sqlite3)
MESSAGE(STATUS "Using project sqlite3 library")
ENDIF(SQLITE3_FOUND)

9
src/CMakeLists.txt
View File

@ -6,8 +6,6 @@ INCLUDE(CheckIncludeFiles)
# Set some random things default to not being visible in the GUI # Set some random things default to not being visible in the GUI
mark_as_advanced(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH) 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) option(ENABLE_CURL "Enable cURL support for fetching media" 1)
@ -174,7 +172,7 @@ else()
set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY}) set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
endif() endif()
find_package(Sqlite3 REQUIRED) find_package(SQLite3 REQUIRED)
find_package(Json REQUIRED) find_package(Json REQUIRED)
option(ENABLE_GLES "Enable OpenGL ES support" 0) option(ENABLE_GLES "Enable OpenGL ES support" 0)
@ -772,11 +770,6 @@ endif(USE_GETTEXT)
# Subdirectories # Subdirectories
if (SQLITE3_FOUND)
else (SQLITE3_FOUND)
add_subdirectory(sqlite)
endif (SQLITE3_FOUND)
if (BUILD_CLIENT AND USE_FREETYPE) if (BUILD_CLIENT AND USE_FREETYPE)
add_subdirectory(cguittfont) add_subdirectory(cguittfont)
endif (BUILD_CLIENT AND USE_FREETYPE) endif (BUILD_CLIENT AND USE_FREETYPE)

16
src/sqlite/CMakeLists.txt
View File

@ -1,16 +0,0 @@
if( UNIX )
set(sqlite3_SRCS sqlite3.c)
set(sqlite3_platform_LIBS "")
else( UNIX )
set(sqlite3_SRCS sqlite3.c)
set(sqlite3_platform_LIBS "")
endif( UNIX )
add_library(sqlite3 ${sqlite3_SRCS})
target_link_libraries(
sqlite3
${sqlite3_platform_LIBS}
)

151706
src/sqlite/sqlite3.c
View File

File diff suppressed because it is too large Load Diff

7543
src/sqlite/sqlite3.h
View File

File diff suppressed because it is too large Load Diff