Skip to content

Commit

Permalink
Increased minimal cmake version to 3.14 to use cmake's official FindS…
Browse files Browse the repository at this point in the history
…QLite3.cmake (#1250)
  • Loading branch information
matlabbe committed Mar 23, 2024
1 parent 2f132b3 commit fa3ece5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 37 deletions.
14 changes: 7 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Top-Level CmakeLists.txt
cmake_minimum_required(VERSION 3.10)
cmake_minimum_required(VERSION 3.14)
PROJECT( RTABMap )
SET(PROJECT_PREFIX rtabmap)

Expand Down Expand Up @@ -252,10 +252,10 @@ endif()

FIND_PACKAGE(ZLIB REQUIRED QUIET)

FIND_PACKAGE(Sqlite3 QUIET)
IF(Sqlite3_FOUND)
MESSAGE(STATUS "Found Sqlite3: ${Sqlite3_INCLUDE_DIRS} ${Sqlite3_LIBRARIES}")
ENDIF(Sqlite3_FOUND)
FIND_PACKAGE(SQLite3 QUIET)
IF(SQLite3_FOUND)
MESSAGE(STATUS "Found SQLite3: ${SQLite3_INCLUDE_DIRS} ${SQLite3_LIBRARIES}")
ENDIF(SQLite3_FOUND)

if(NOT "${PCL_LIBRARIES}" STREQUAL "")
# fix libproj.so not found on Xenial
Expand Down Expand Up @@ -1332,10 +1332,10 @@ ELSE()
MESSAGE(STATUS " With Qt = NO (Qt not found)")
ENDIF()

IF(Sqlite3_FOUND)
IF(SQLite3_FOUND)
MESSAGE(STATUS " With external SQLite3 = YES (License: Public Domain)")
ELSE()
MESSAGE(STATUS " With external SQLite3 = NO (sqlite3 not found, internal version is used for convenience)")
MESSAGE(STATUS " With external SQLite3 = NO (SQLite3 not found, internal version is used for convenience)")
ENDIF()

IF(WITH_ORB_OCTREE)
Expand Down
30 changes: 0 additions & 30 deletions cmake_modules/FindSqlite3.cmake

This file was deleted.

0 comments on commit fa3ece5

Please sign in to comment.