diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= -cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) +cmake_minimum_required(VERSION 3.5 FATAL_ERROR) # # Preliminary setup diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -204,18 +204,9 @@ ############################################################ # Pick sensible versions of the C and C++ standards. -# Note that MSVC does not have equivalent flags; the features are either -# supported or they are not. -if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang") - # We use the C89 standard because that is what is common to all our - # compilers (in particular, MSVC 2010 does not support C99) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=iso9899:1990") -endif() -if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -endif() +set(CMAKE_C_STANDARD 90) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED True) # Do not merge uninitialized global variables. # This is mostly a "principle of least surprise" thing, but also diff --git a/tests/ECMAddAppIconTest/CMakeLists.txt b/tests/ECMAddAppIconTest/CMakeLists.txt --- a/tests/ECMAddAppIconTest/CMakeLists.txt +++ b/tests/ECMAddAppIconTest/CMakeLists.txt @@ -1,5 +1,5 @@ project(ECMAddAppIconTest) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../modules diff --git a/tests/ECMAddTests/multi_tests/CMakeLists.txt b/tests/ECMAddTests/multi_tests/CMakeLists.txt --- a/tests/ECMAddTests/multi_tests/CMakeLists.txt +++ b/tests/ECMAddTests/multi_tests/CMakeLists.txt @@ -1,5 +1,5 @@ project(ECMAddTests) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) set(CMAKE_MODULE_PATH "${ECM_MODULE_DIR}") diff --git a/tests/ECMAddTests/single_tests/CMakeLists.txt b/tests/ECMAddTests/single_tests/CMakeLists.txt --- a/tests/ECMAddTests/single_tests/CMakeLists.txt +++ b/tests/ECMAddTests/single_tests/CMakeLists.txt @@ -1,5 +1,5 @@ project(ECMAddTests) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) set(CMAKE_MODULE_PATH "${ECM_MODULE_DIR}") diff --git a/tests/ECMInstallIconsTest/CMakeLists.txt b/tests/ECMInstallIconsTest/CMakeLists.txt --- a/tests/ECMInstallIconsTest/CMakeLists.txt +++ b/tests/ECMInstallIconsTest/CMakeLists.txt @@ -1,5 +1,5 @@ project(ECMInstallIconsTest) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../modules) diff --git a/tests/ECMPoQmToolsTest/CMakeLists.txt b/tests/ECMPoQmToolsTest/CMakeLists.txt --- a/tests/ECMPoQmToolsTest/CMakeLists.txt +++ b/tests/ECMPoQmToolsTest/CMakeLists.txt @@ -1,5 +1,5 @@ project(ECMPoQmToolsTest) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) set(ECM_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../modules") set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../modules) diff --git a/tests/ECMQMLModules/CMakeLists.txt b/tests/ECMQMLModules/CMakeLists.txt --- a/tests/ECMQMLModules/CMakeLists.txt +++ b/tests/ECMQMLModules/CMakeLists.txt @@ -1,5 +1,5 @@ project(extra-cmake-modules) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) set(ECM_FIND_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules) set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../modules) diff --git a/tests/ECMQtDeclareLoggingCategoryTest/CMakeLists.txt b/tests/ECMQtDeclareLoggingCategoryTest/CMakeLists.txt --- a/tests/ECMQtDeclareLoggingCategoryTest/CMakeLists.txt +++ b/tests/ECMQtDeclareLoggingCategoryTest/CMakeLists.txt @@ -1,5 +1,5 @@ project(ECMQtDeclareLoggingCategoryTest) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) set(ECM_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../modules") set(CMAKE_MODULE_PATH ${ECM_MODULE_DIR}) diff --git a/tests/ECMSetupVersionTest/old_header/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header/CMakeLists.txt --- a/tests/ECMSetupVersionTest/old_header/CMakeLists.txt +++ b/tests/ECMSetupVersionTest/old_header/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(old_header) diff --git a/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt --- a/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt +++ b/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(old_header_abspath) diff --git a/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt b/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt --- a/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt +++ b/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(old_simple) diff --git a/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt b/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt --- a/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt +++ b/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(old_soversion) diff --git a/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt --- a/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt +++ b/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(old_version_file) diff --git a/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt --- a/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt +++ b/tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(old_version_file_abspath) diff --git a/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt --- a/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt +++ b/tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(old_version_file_anynewer) diff --git a/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt --- a/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt +++ b/tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(old_version_file_exact) diff --git a/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt --- a/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt +++ b/tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(old_version_file_samemajor) diff --git a/tests/ExecuteCoreModules/CMakeLists.txt b/tests/ExecuteCoreModules/CMakeLists.txt --- a/tests/ExecuteCoreModules/CMakeLists.txt +++ b/tests/ExecuteCoreModules/CMakeLists.txt @@ -1,5 +1,5 @@ project(ExecuteCoreModules) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) file(GLOB all_core_modules "${CMAKE_CURRENT_SOURCE_DIR}/../../modules/*cmake") diff --git a/tests/ExecuteKDEModules/CMakeLists.txt b/tests/ExecuteKDEModules/CMakeLists.txt --- a/tests/ExecuteKDEModules/CMakeLists.txt +++ b/tests/ExecuteKDEModules/CMakeLists.txt @@ -1,5 +1,5 @@ project(ExecuteKDEModules) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) # order is important (install dirs before cmake settings)! set(all_kde_modules diff --git a/tests/FindModules/CMakeLists.txt b/tests/FindModules/CMakeLists.txt --- a/tests/FindModules/CMakeLists.txt +++ b/tests/FindModules/CMakeLists.txt @@ -1,5 +1,5 @@ project(FindModules) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) file(GLOB all_find_modules RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules" diff --git a/tests/KDEFetchTranslations/CMakeLists.txt b/tests/KDEFetchTranslations/CMakeLists.txt --- a/tests/KDEFetchTranslations/CMakeLists.txt +++ b/tests/KDEFetchTranslations/CMakeLists.txt @@ -1,5 +1,5 @@ project(extra-cmake-modules) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) # order is important (install dirs before cmake settings)! set(all_kde_modules diff --git a/tests/KDEInstallDirsTest/relative_or_absolute/CMakeLists.txt b/tests/KDEInstallDirsTest/relative_or_absolute/CMakeLists.txt --- a/tests/KDEInstallDirsTest/relative_or_absolute/CMakeLists.txt +++ b/tests/KDEInstallDirsTest/relative_or_absolute/CMakeLists.txt @@ -1,5 +1,5 @@ project(KDEInstallDirs.relative_or_absolute) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) set(ECM_KDE_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../kde-modules) set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) diff --git a/tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt b/tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt --- a/tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt +++ b/tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt @@ -1,5 +1,5 @@ project(KDEInstallDirs.vars_in_sync) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) set(ECM_KDE_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../kde-modules) set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) diff --git a/tests/KDEPackageAppTemplatesTest/qml-plasmoid/CMakeLists.txt b/tests/KDEPackageAppTemplatesTest/qml-plasmoid/CMakeLists.txt --- a/tests/KDEPackageAppTemplatesTest/qml-plasmoid/CMakeLists.txt +++ b/tests/KDEPackageAppTemplatesTest/qml-plasmoid/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) project(plasma-%{APPNAMELC}) diff --git a/tests/UseFindModules/CMakeLists.txt b/tests/UseFindModules/CMakeLists.txt --- a/tests/UseFindModules/CMakeLists.txt +++ b/tests/UseFindModules/CMakeLists.txt @@ -1,5 +1,5 @@ project(UseFindModules) -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) set(ECM_FIND_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../find-modules") set(ECM_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../modules")