From 9e9311234c1a1499640ff13557c80f3959a36ad9 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 14 Oct 2018 22:11:44 +0200 Subject: [PATCH] Set cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) Removed CMAKE_BUILD_TYPE --- CMakeLists.txt | 12 ++++++------ lib/translations/CMakeLists.txt | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 653e973b..55a11bf0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,9 @@ -cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) - +cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) +# CMP0000: Call the cmake_minimum_required() command at the beginning of the top-level +# CMakeLists.txt file even before calling the project() command. +# The cmake_minimum_required(VERSION) command implicitly invokes the cmake_policy(VERSION) +# command to specify that the current project code is written for the given range of CMake +# versions. project(qtermwidget) include(GNUInstallDirs) @@ -26,10 +30,6 @@ set(QTERMWIDGET_VERSION "${QTERMWIDGET_VERSION_MAJOR}.${QTERMWIDGET_VERSION_MINO # additional cmake files set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake") -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) -endif() - set(CMAKE_INCLUDE_CURRENT_DIR ON) find_package(Qt5Widgets "${REQUIRED_QT_VERSION}" REQUIRED) diff --git a/lib/translations/CMakeLists.txt b/lib/translations/CMakeLists.txt index ce40923f..84bb691b 100644 --- a/lib/translations/CMakeLists.txt +++ b/lib/translations/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) - project(qtermwidget) build_component("." "${CMAKE_INSTALL_FULL_DATADIR}/qtermwidget/translations")