Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/bareos/bareos.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rogge <andreas.rogge@bareos.com>2022-10-19 10:37:27 +0300
committerAndreas Rogge <andreas.rogge@bareos.com>2022-11-09 18:15:50 +0300
commitc24d6f73a2951cd67120ca40a73578d813936627 (patch)
tree2aa324ad8bbc5f3c3be644f468b639fc1862d23a
parent4f18cc6f46c4bf5172c45490fa752b20329d414b (diff)
cmake: bump minimum required version to 3.17
also set cmake_policy version to 3.17...3.19 enabling all policies present in CMake up until 3.19. CMake 3.19 contains the newest policy we require (CMP0109) which makes find_program() only check for executability but not readability which allows to find sudo.
-rw-r--r--CMakeLists.txt3
-rw-r--r--contrib/CMakeLists.txt1
-rw-r--r--core/CMakeLists.txt10
-rw-r--r--core/platforms/packaging/bareos.spec2
-rw-r--r--core/src/droplet/CMakeLists.txt3
-rw-r--r--core/src/droplet/libdroplet/CMakeLists.txt2
-rw-r--r--core/src/fastlz/CMakeLists.txt1
-rw-r--r--core/src/qt-tray-monitor/CMakeLists.txt3
-rw-r--r--core/src/vmware/CMakeLists.txt3
-rw-r--r--debian/control2
-rw-r--r--debian/control.src2
-rw-r--r--docs/manuals/CMakeLists.txt2
-rw-r--r--get_version.cmake5
-rw-r--r--systemtests/CMakeLists.txt1
-rw-r--r--systemtests/cmake/BareosSystemtestFunctions.cmake4
-rw-r--r--webui/CMakeLists.txt3
-rw-r--r--write_version_files.cmake5
17 files changed, 14 insertions, 38 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f2690ef5..929edd985 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,8 @@
# 02110-1301, USA.
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.17)
+cmake_policy(VERSION 3.17...3.19)
project(bareos NONE)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index e0086aa4c..45a8ee57d 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -17,7 +17,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
-cmake_minimum_required(VERSION 3.0)
project(bareos-contrib)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 47ccae2b9..489b2825e 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -17,8 +17,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
-
-cmake_minimum_required(VERSION 3.12)
project(bareos C CXX)
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
@@ -28,14 +26,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
)
endif()
-cmake_policy(SET CMP0054 NEW)
-cmake_policy(SET CMP0057 NEW)
-cmake_policy(SET CMP0079 NEW)
-
-if(POLICY CMP0109)
- cmake_policy(SET CMP0109 NEW)
-endif(POLICY CMP0109)
-
# disable in-source builds
if("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
message(FATAL_ERROR "In-source builds are not allowed.")
diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec
index 5c863eb0e..bd87de891 100644
--- a/core/platforms/packaging/bareos.spec
+++ b/core/platforms/packaging/bareos.spec
@@ -148,7 +148,7 @@ BuildRequires: git-core
Source0: %{name}-%{version}.tar.gz
-BuildRequires: cmake >= 3.12
+BuildRequires: cmake >= 3.17
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: make
diff --git a/core/src/droplet/CMakeLists.txt b/core/src/droplet/CMakeLists.txt
index 42f33fceb..6ccbceec2 100644
--- a/core/src/droplet/CMakeLists.txt
+++ b/core/src/droplet/CMakeLists.txt
@@ -1,6 +1,6 @@
# BAREOS® - Backup Archiving REcovery Open Sourced
#
-# Copyright (C) 2020-2020 Bareos GmbH & Co. KG
+# Copyright (C) 2020-2022 Bareos GmbH & Co. KG
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of version three of the GNU Affero General Public
@@ -21,7 +21,6 @@ message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
message(STATUS "Try to configure LibDroplet")
list(APPEND CMAKE_MESSAGE_INDENT " ")
-cmake_minimum_required(VERSION 3.0)
project(droplet C)
set(default_build_type "Debug")
diff --git a/core/src/droplet/libdroplet/CMakeLists.txt b/core/src/droplet/libdroplet/CMakeLists.txt
index 929b12732..52792cbc8 100644
--- a/core/src/droplet/libdroplet/CMakeLists.txt
+++ b/core/src/droplet/libdroplet/CMakeLists.txt
@@ -18,8 +18,6 @@
# 02110-1301, USA.
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
-cmake_minimum_required(VERSION 3.0)
-
add_library(
droplet STATIC
src/conn.c
diff --git a/core/src/fastlz/CMakeLists.txt b/core/src/fastlz/CMakeLists.txt
index 57e4c425c..4bffee628 100644
--- a/core/src/fastlz/CMakeLists.txt
+++ b/core/src/fastlz/CMakeLists.txt
@@ -17,7 +17,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
-cmake_minimum_required(VERSION 3.0)
project(bareosfastlz LANGUAGES C)
add_library(
diff --git a/core/src/qt-tray-monitor/CMakeLists.txt b/core/src/qt-tray-monitor/CMakeLists.txt
index 2562aace7..a4be2cf60 100644
--- a/core/src/qt-tray-monitor/CMakeLists.txt
+++ b/core/src/qt-tray-monitor/CMakeLists.txt
@@ -18,9 +18,6 @@
# 02110-1301, USA.
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
-cmake_minimum_required(VERSION 3.0)
-# (for AUTOUIC)
-
if(HAVE_WIN32)
add_definitions(-D_STAT_DEFINED=1)
endif()
diff --git a/core/src/vmware/CMakeLists.txt b/core/src/vmware/CMakeLists.txt
index 43ac195b9..407d69d16 100644
--- a/core/src/vmware/CMakeLists.txt
+++ b/core/src/vmware/CMakeLists.txt
@@ -1,7 +1,7 @@
#
# BAREOS - Backup Archiving REcovery Open Sourced
#
-# Copyright (C) 2017-2020 Bareos GmbH & Co. KG
+# Copyright (C) 2017-2022 Bareos GmbH & Co. KG
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of version three of the GNU Affero General Public
@@ -19,6 +19,5 @@
# 02110-1301, USA.
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
-cmake_minimum_required(VERSION 3.0)
add_subdirectory(vadp_dumper)
add_subdirectory(vmware_cbt_tool)
diff --git a/debian/control b/debian/control
index dc19efc08..fd2ea6e7a 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: acl-dev,
apache2 | httpd,
bc,
chrpath,
- cmake (>= 3.12.0) | cmake-mozilla,
+ cmake (>= 3.17.0) | cmake-mozilla,
debhelper (>= 7.0.50~),
dpkg-dev (>= 1.13.19),
libacl1-dev,
diff --git a/debian/control.src b/debian/control.src
index 08f9b0d17..52e39a910 100644
--- a/debian/control.src
+++ b/debian/control.src
@@ -13,7 +13,7 @@ Build-Depends: acl-dev,
apache2 | httpd,
bc,
chrpath,
- cmake (>= 3.12.0) | cmake-mozilla,
+ cmake (>= 3.17.0) | cmake-mozilla,
debhelper (>= 7.0.50~),
dpkg-dev (>= 1.13.19),
libacl1-dev,
diff --git a/docs/manuals/CMakeLists.txt b/docs/manuals/CMakeLists.txt
index b36ef6c65..ae48cec74 100644
--- a/docs/manuals/CMakeLists.txt
+++ b/docs/manuals/CMakeLists.txt
@@ -17,8 +17,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
-cmake_minimum_required(VERSION 3.0)
-
project(bareos-docs NONE)
set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM 1)
diff --git a/get_version.cmake b/get_version.cmake
index dc6bc98a4..3111fc751 100644
--- a/get_version.cmake
+++ b/get_version.cmake
@@ -1,6 +1,6 @@
# BAREOS® - Backup Archiving REcovery Open Sourced
#
-# Copyright (C) 2019-2019 Bareos GmbH & Co. KG
+# Copyright (C) 2019-2022 Bareos GmbH & Co. KG
#
# This program is Free Software; you can redistribute it and/or modify it under
# the terms of version three of the GNU Affero General Public License as
@@ -15,7 +15,8 @@
# with this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.17)
+cmake_policy(VERSION 3.17...3.19)
if(NOT DEFINED VERSION_STRING)
set(CMAKE_MODULE_PATH
diff --git a/systemtests/CMakeLists.txt b/systemtests/CMakeLists.txt
index e49b7dff0..58d334fd1 100644
--- a/systemtests/CMakeLists.txt
+++ b/systemtests/CMakeLists.txt
@@ -19,7 +19,6 @@
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
-cmake_minimum_required(VERSION 3.3)
project(bareos-systemtests)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
diff --git a/systemtests/cmake/BareosSystemtestFunctions.cmake b/systemtests/cmake/BareosSystemtestFunctions.cmake
index dfb955903..f7f6d93cb 100644
--- a/systemtests/cmake/BareosSystemtestFunctions.cmake
+++ b/systemtests/cmake/BareosSystemtestFunctions.cmake
@@ -17,10 +17,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
-cmake_policy(SET CMP0057 NEW) # IF(.. IN_LIST ..)
-cmake_policy(SET CMP0053 NEW)
-cmake_policy(SET CMP0064 NEW) # IF(TEST ...)
-
macro(create_systemtests_directory)
configurefilestosystemtest("systemtests" "data" "*.tgz" COPYONLY "")
configurefilestosystemtest("systemtests" "data" "*.gz" COPYONLY "")
diff --git a/webui/CMakeLists.txt b/webui/CMakeLists.txt
index 0c75fc989..288be678b 100644
--- a/webui/CMakeLists.txt
+++ b/webui/CMakeLists.txt
@@ -1,6 +1,6 @@
# BAREOS® - Backup Archiving REcovery Open Sourced
#
-# Copyright (C) 2018-2021 Bareos GmbH & Co. KG
+# Copyright (C) 2018-2022 Bareos GmbH & Co. KG
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of version three of the GNU Affero General Public
@@ -17,7 +17,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
-cmake_minimum_required(VERSION 3.0)
project(bareos-webui)
include(GNUInstallDirs)
diff --git a/write_version_files.cmake b/write_version_files.cmake
index ecfa9613a..8d812c46b 100644
--- a/write_version_files.cmake
+++ b/write_version_files.cmake
@@ -1,6 +1,6 @@
# BAREOS® - Backup Archiving REcovery Open Sourced
#
-# Copyright (C) 2019-2021 Bareos GmbH & Co. KG
+# Copyright (C) 2019-2022 Bareos GmbH & Co. KG
#
# This program is Free Software; you can redistribute it and/or modify it under
# the terms of version three of the GNU Affero General Public License as
@@ -15,7 +15,8 @@
# with this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.17)
+cmake_policy(VERSION 3.17...3.19)
set(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_LIST_DIR}/cmake" "${CMAKE_CURRENT_LIST_DIR}/core/cmake"