From 9763333e639a5072f0dddbe10035fa7bdfb346c9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 15 Jan 2019 22:32:53 +0100 Subject: [PATCH] Revert "buildsystem: relax requirement on cmake version" In e8b6b7a, we relaxed the cmake version check down to 3.1, the first version to expose target_compile_features(). However, an error while testing that change improperly concluded that the change was OK. While target_compile_features() was indeed introduced in cmake 3.1, the actual feature we use it to test, cxx_std_11, was really introduced only with cmake-3.8, which explained the actual version that was requested before e8b6b7a. Coming up with a working test is not as trivial as initially thought, so a better solution will have to be devised in the future. In the mean time, revert to the previously-working situation. This reverts commit e8b6b7adc138a66f8d47396a2e707366d3771028. Reported-by: Patrick Boettcher Signed-off-by: "Yann E. MORIN" --- CMakeLists.txt | 2 +- benchmarks/CMakeLists.txt | 2 +- test/cmake_add_subdirectory/project/CMakeLists.txt | 2 +- test/cmake_import/project/CMakeLists.txt | 2 +- test/cmake_import_minver/project/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da6f08e7f..409f5bff3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.8) ## ## PROJECT diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index 06da16e43..953b1cb84 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.8) project(JSON_Benchmarks LANGUAGES CXX) # set compiler flags diff --git a/test/cmake_add_subdirectory/project/CMakeLists.txt b/test/cmake_add_subdirectory/project/CMakeLists.txt index 21357b685..2c5be183b 100644 --- a/test/cmake_add_subdirectory/project/CMakeLists.txt +++ b/test/cmake_add_subdirectory/project/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.8) project(DummyImport CXX) diff --git a/test/cmake_import/project/CMakeLists.txt b/test/cmake_import/project/CMakeLists.txt index fe892fc1f..d268d72c1 100644 --- a/test/cmake_import/project/CMakeLists.txt +++ b/test/cmake_import/project/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.8) project(DummyImport CXX) diff --git a/test/cmake_import_minver/project/CMakeLists.txt b/test/cmake_import_minver/project/CMakeLists.txt index 29056bdc5..eeef32960 100644 --- a/test/cmake_import_minver/project/CMakeLists.txt +++ b/test/cmake_import_minver/project/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.8) project(DummyImportMinVer CXX)