Skip to content

Raise CMake floor to 3.15...3.31 and use find_package(SQLite3) (subsumes #1084) #1478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bmehta001 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Raise CMake floor to 3.15...3.31 and use find_package(SQLite3) (subsumes #1084) #1478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5...3.29)
cmake_minimum_required(VERSION 3.15...3.31)
project(MSTelemetry LANGUAGES C CXX)

################################################################################################
Expand Down
2 changes: 1 addition & 1 deletion examples/c/SampleC-Guest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5...3.29)
cmake_minimum_required(VERSION 3.15...3.31)
project(SampleC-Guest)

# Uncomment for building i386 binary on x86_64 system
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/EventSender/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5...3.29)
cmake_minimum_required(VERSION 3.15...3.31)
project(EventSender)

# Uncomment for building i386 binary on x86_64 system
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/MacProxy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5...3.29)
cmake_minimum_required(VERSION 3.15...3.31)
project(MacProxy)

# Uncomment for building i386 binary on x86_64 system
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/SampleCpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5...3.29)
cmake_minimum_required(VERSION 3.15...3.31)
project(SampleCpp)

# Uncomment for building i386 binary on x86_64 system
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/SampleCppMini/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5...3.29)
cmake_minimum_required(VERSION 3.15...3.31)
project(SampleCppMini)

# Uncomment for building i386 binary on x86_64 system
Expand Down
2 changes: 1 addition & 1 deletion examples/objc/cocoa-app/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5...3.29)
cmake_minimum_required(VERSION 3.15...3.31)
project(foo)

include(${CMAKE_CURRENT_LIST_DIR}/../../cmake/MSTelemetrySample.cmake)
Expand Down
5 changes: 4 additions & 1 deletion lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,10 @@ else()
elseif(EXISTS "/opt/homebrew/opt/sqlite/lib/libsqlite3.a")
set(MATSDK_SQLITE3_LIB "/opt/homebrew/opt/sqlite/lib/libsqlite3.a")
else()
set(MATSDK_SQLITE3_LIB "sqlite3")
# find_package(SQLite3) needs CMake >= 3.14, guaranteed by the project floor;
# SQLite::SQLite3 is an imported target carrying its own include dirs.
find_package(SQLite3 REQUIRED)
set(MATSDK_SQLITE3_LIB SQLite::SQLite3)
endif()

find_package(ZLIB REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion lib/android_build/app/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Sets the minimum version of CMake required to build the native library.

cmake_minimum_required(VERSION 3.5...3.29)
cmake_minimum_required(VERSION 3.15...3.31)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

Expand Down
2 changes: 1 addition & 1 deletion lib/android_build/maesdk/src/main/cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Sets the minimum version of CMake required to build the native library.

cmake_minimum_required(VERSION 3.10.2)
cmake_minimum_required(VERSION 3.15...3.31)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

Expand Down
3 changes: 2 additions & 1 deletion tests/functests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ else()
elseif(EXISTS "/usr/local/opt/sqlite/lib/libsqlite3.a")
set (SQLITE3_LIB "/usr/local/opt/sqlite/lib/libsqlite3.a")
else()
set (SQLITE3_LIB "sqlite3")
find_package(SQLite3 REQUIRED)
set (SQLITE3_LIB SQLite::SQLite3)
endif()

if(TARGET zlib_bundled)
Expand Down
3 changes: 2 additions & 1 deletion tests/unittests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,8 @@ else()
# Apple Silicon homebrew installs to /opt/homebrew instead of /usr/local
set (SQLITE3_LIB "/opt/homebrew/opt/sqlite/lib/libsqlite3.a")
else()
set (SQLITE3_LIB "sqlite3")
find_package(SQLite3 REQUIRED)
set (SQLITE3_LIB SQLite::SQLite3)
endif()

if(TARGET zlib_bundled)
Expand Down
2 changes: 1 addition & 1 deletion tests/vcpkg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.15)
cmake_minimum_required(VERSION 3.15...3.31)
project(cpp-client-telemetry_vcpkg_test LANGUAGES CXX)

set(CMAKE_CXX_STANDARD 11)
Expand Down
2 changes: 1 addition & 1 deletion wrappers/obj-c/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.2)
cmake_minimum_required(VERSION 3.15...3.31)

PROJECT(ObjC_Wrapper)

Expand Down
2 changes: 1 addition & 1 deletion wrappers/swift/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# and linking the static libs to generate the executable.
# ------------------------------------------------------------------------------------------------------------

CMAKE_MINIMUM_REQUIRED(VERSION 3.15)
cmake_minimum_required(VERSION 3.15...3.31)

# Set build and path related variables
string(TOLOWER ${CMAKE_BUILD_TYPE} LOWER_BUILD_TYPE)
Expand Down
Loading