diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-01-04 13:48:23 -0500 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2015-01-08 16:34:42 -0500 |
| commit | a3db918f7834b859e80175125610e503bee0af35 (patch) | |
| tree | 76edee21e5397ee2bf73869dc5cca285a614a2c4 /cmake | |
| parent | d8cf64a2029dd8122d5ba0830c0f3dae9db95cf7 (diff) | |
| download | minetest-a3db918f7834b859e80175125610e503bee0af35.tar.gz minetest-a3db918f7834b859e80175125610e503bee0af35.tar.bz2 minetest-a3db918f7834b859e80175125610e503bee0af35.zip | |
Remove included SQLite3
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindIrrlicht.cmake | 8 | ||||
| -rw-r--r-- | cmake/Modules/FindSQLite3.cmake | 9 | ||||
| -rw-r--r-- | cmake/Modules/FindSqlite3.cmake | 18 |
3 files changed, 10 insertions, 25 deletions
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake index bd0042262..dce78fbaa 100644 --- 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 new file mode 100644 index 000000000..b23553a80 --- /dev/null +++ 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 deleted file mode 100644 index ecce6e38e..000000000 --- a/cmake/Modules/FindSqlite3.cmake +++ /dev/null @@ -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) |