From 9d8135bfd7a65a1a20dd76514494f453aab6dc46 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 10 Jan 2020 17:58:41 +0100 Subject: [PATCH] Require CMake 3.3.0 in all modules --- CMakeLists.txt | 2 +- cmake/modules/AppTarget.cmake | 2 ++ cmake/modules/BasicConfig.cmake | 2 ++ cmake/modules/Doxygen.cmake | 2 ++ cmake/modules/ListToString.cmake | 2 ++ cmake/modules/ShellCompletion.cmake | 2 ++ cmake/modules/TemplateFinder.cmake | 2 ++ cmake/modules/TestTarget.cmake | 2 ++ cmake/modules/WindowsResources.cmake | 2 ++ 9 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7865796..28c3460 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR) project(c++utilities) diff --git a/cmake/modules/AppTarget.cmake b/cmake/modules/AppTarget.cmake index b145b28..7070183 100644 --- a/cmake/modules/AppTarget.cmake +++ b/cmake/modules/AppTarget.cmake @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR) + if (NOT BASIC_PROJECT_CONFIG_DONE) message(FATAL_ERROR "Before including the AppTarget module, the BasicConfig module must be included.") endif () diff --git a/cmake/modules/BasicConfig.cmake b/cmake/modules/BasicConfig.cmake index c05c6c8..509102a 100644 --- a/cmake/modules/BasicConfig.cmake +++ b/cmake/modules/BasicConfig.cmake @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR) + # check whether the required project meta-data has been set before including this module if (NOT META_PROJECT_NAME) message(FATAL_ERROR "No project name (META_PROJECT_NAME) specified.") diff --git a/cmake/modules/Doxygen.cmake b/cmake/modules/Doxygen.cmake index 784716c..1cb29ae 100644 --- a/cmake/modules/Doxygen.cmake +++ b/cmake/modules/Doxygen.cmake @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR) + if (NOT BASIC_PROJECT_CONFIG_DONE) message(FATAL_ERROR "Before including the Doxygen module, the BasicConfig module must be included.") endif () diff --git a/cmake/modules/ListToString.cmake b/cmake/modules/ListToString.cmake index 74b782e..01f1282 100644 --- a/cmake/modules/ListToString.cmake +++ b/cmake/modules/ListToString.cmake @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR) + # prevent multiple inclusion if (DEFINED LIST_TO_STRING_LOADED) return() diff --git a/cmake/modules/ShellCompletion.cmake b/cmake/modules/ShellCompletion.cmake index d15edc9..1c86275 100644 --- a/cmake/modules/ShellCompletion.cmake +++ b/cmake/modules/ShellCompletion.cmake @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR) + if (NOT BASIC_PROJECT_CONFIG_DONE) message(FATAL_ERROR "Before including the ShellCompletion module, the BasicConfig module must be included.") endif () diff --git a/cmake/modules/TemplateFinder.cmake b/cmake/modules/TemplateFinder.cmake index 09c00ae..e2bea17 100644 --- a/cmake/modules/TemplateFinder.cmake +++ b/cmake/modules/TemplateFinder.cmake @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR) + # prevent multiple inclusion if (DEFINED TEMPLATE_FINDER_LOADED) return() diff --git a/cmake/modules/TestTarget.cmake b/cmake/modules/TestTarget.cmake index 806dc7b..935f7d5 100644 --- a/cmake/modules/TestTarget.cmake +++ b/cmake/modules/TestTarget.cmake @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR) + if (NOT BASIC_PROJECT_CONFIG_DONE) message(FATAL_ERROR "Before including the TestTarget module, the BasicConfig module must be included.") endif () diff --git a/cmake/modules/WindowsResources.cmake b/cmake/modules/WindowsResources.cmake index eeba5f2..24787ed 100644 --- a/cmake/modules/WindowsResources.cmake +++ b/cmake/modules/WindowsResources.cmake @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR) + # generates and adds a Windows rc file for the application/library also attaches the application icon if ffmpeg is available # does nothing if not building with mingw-w64