Skip to content

Commit

Permalink
VPN-5628: Increase minimum CMake to 3.18 (#8324)
Browse files Browse the repository at this point in the history
* Update minimum CMake to 3.18
* Remove CMake workarounds for versions < 3.18
  • Loading branch information
oskirby authored Oct 18, 2023
1 parent d337aac commit 998ed1f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 11 deletions.
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.18)

message("Configuring for ${CMAKE_GENERATOR}")
get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
Expand Down Expand Up @@ -89,9 +89,6 @@ endif()
## Toolchain Setup
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.17)
cmake_policy(SET CMP0099 OLD)
endif()

find_program(PYTHON_EXECUTABLE NAMES python3 python)
if(MSVC)
Expand Down
2 changes: 1 addition & 1 deletion addons/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.18)

project(addons VERSION 1.0.0 LANGUAGES CXX
DESCRIPTION "Mozilla VPN Addons"
Expand Down
2 changes: 1 addition & 1 deletion linux/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Priority: optional
Maintainer: mozilla <[email protected]>
Build-Depends: debhelper (>= 11.2),
cdbs,
cmake (>= 3.16~),
cmake (>= 3.18~),
flex,
gcc (>=4:8.0.0~),
g++ (>=4:8.0.0~),
Expand Down
5 changes: 1 addition & 4 deletions lottie/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.18)

project(lottie VERSION 1.0.0 LANGUAGES CXX
DESCRIPTION "Lightweight scalable animations: QML Wrapper library"
Expand All @@ -14,9 +14,6 @@ set(CMAKE_AUTOUIC ON)
if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
set(CMAKE_FOLDER "Lottie")
endif()
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.17)
cmake_policy(SET CMP0099 OLD)
endif()

add_library(lottie STATIC)

Expand Down
2 changes: 1 addition & 1 deletion tests/functional/addons/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

cmake_minimum_required(VERSION 3.16)
cmake_minimum_required(VERSION 3.18)

project(testing_addons VERSION 1.0.0 LANGUAGES CXX
DESCRIPTION "Mozilla VPN Addons for Functional Testing"
Expand Down

0 comments on commit 998ed1f

Please sign in to comment.