From 5b1968260c757f4a6bd537dc8c4f4f06a6f40342 Mon Sep 17 00:00:00 2001 From: Kent Knox Date: Fri, 28 Jul 2017 17:30:29 -0500 Subject: [PATCH] Bump minimum cmake version required to v3.5 This is the minimum implied by the ROCm software platform with ubuntu 16.04 and fedora 24 --- CMakeLists.txt | 4 ++-- clients/CMakeLists.txt | 4 ++-- clients/benchmarks/CMakeLists.txt | 5 ++--- clients/gtest/CMakeLists.txt | 5 ++--- clients/samples/CMakeLists.txt | 5 ++--- deps/CMakeLists.txt | 4 ++-- library/CMakeLists.txt | 5 ++--- 7 files changed, 14 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b142ab0b..e7c8eac0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ # Copyright 2016 Advanced Micro Devices, Inc. # ######################################################################## -# Natively available on including Ubuntu 14.04, OpenSUSE 13.2, CentOS 6.6 -cmake_minimum_required( VERSION 2.8.12 ) +# The ROCm platform requires Ubuntu 16.04 or Fedora 24, which has cmake 3.5 +cmake_minimum_required( VERSION 3.5 ) # On windows, it's convenient to change the default install prefix such that it does NOT point to 'program files' if( WIN32 AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT ) diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt index 89774999d..207bede52 100644 --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -2,8 +2,8 @@ # Copyright 2016 Advanced Micro Devices, Inc. # ######################################################################## -# Natively available on including Ubuntu 14.04, OpenSUSE 13.2, CentOS 6.6 -cmake_minimum_required( VERSION 2.8.12 ) +# The ROCm platform requires Ubuntu 16.04 or Fedora 24, which has cmake 3.5 +cmake_minimum_required( VERSION 3.5 ) # This project may compile dependencies for clients project( rocblas-clients CXX ) diff --git a/clients/benchmarks/CMakeLists.txt b/clients/benchmarks/CMakeLists.txt index ec7cf43a6..3e2c91e23 100644 --- a/clients/benchmarks/CMakeLists.txt +++ b/clients/benchmarks/CMakeLists.txt @@ -1,9 +1,8 @@ # ######################################################################## # Copyright 2016 Advanced Micro Devices, Inc. # ######################################################################## -# We require 2.8.12 for linking libraries we specify PRIVATE, INTERFACE and -# PUBLIC keywords -cmake_minimum_required( VERSION 2.8.12 ) +# The ROCm platform requires Ubuntu 16.04 or Fedora 24, which has cmake 3.5 +cmake_minimum_required( VERSION 3.5 ) include( build-version ) project_version( NAME rocblas-client LANGUAGES CXX ) diff --git a/clients/gtest/CMakeLists.txt b/clients/gtest/CMakeLists.txt index 749bb898a..861e00113 100644 --- a/clients/gtest/CMakeLists.txt +++ b/clients/gtest/CMakeLists.txt @@ -1,9 +1,8 @@ # ######################################################################## # Copyright 2016 Advanced Micro Devices, Inc. # ######################################################################## -# We require 2.8.12 for linking libraries we specify PRIVATE, INTERFACE and -# PUBLIC keywords -cmake_minimum_required( VERSION 2.8.12 ) +# The ROCm platform requires Ubuntu 16.04 or Fedora 24, which has cmake 3.5 +cmake_minimum_required( VERSION 3.5 ) if( CMAKE_GENERATOR MATCHES "NMake" ) option( NMAKE_COMPILE_VERBOSE "Print VERBOSE compile/link msgs to the console" OFF ) diff --git a/clients/samples/CMakeLists.txt b/clients/samples/CMakeLists.txt index 868c2a48c..d2acfb98f 100644 --- a/clients/samples/CMakeLists.txt +++ b/clients/samples/CMakeLists.txt @@ -1,9 +1,8 @@ # ######################################################################## # Copyright 2016 Advanced Micro Devices, Inc. # ######################################################################## -# We require 2.8.12 for linking libraries we specify PRIVATE, INTERFACE and -# PUBLIC keywords -cmake_minimum_required( VERSION 2.8.12 ) +# The ROCm platform requires Ubuntu 16.04 or Fedora 24, which has cmake 3.5 +cmake_minimum_required( VERSION 3.5 ) if( CMAKE_GENERATOR MATCHES "NMake" ) option( NMAKE_COMPILE_VERBOSE "Print VERBOSE compile/link msgs to the console" OFF ) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 278516d9c..ba127745d 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -4,8 +4,8 @@ # Helper cmake script to automate building dependencies for rocblas # This script can be invoked manually by the user with 'cmake -P' -# Natively available on including Ubuntu 14.04, OpenSUSE 13.2, CentOS 6.6 -cmake_minimum_required( VERSION 2.8.12 ) +# The ROCm platform requires Ubuntu 16.04 or Fedora 24, which has cmake 3.5 +cmake_minimum_required( VERSION 3.5 ) # On windows, it's convenient to change the default install prefix such that it does NOT point to 'program files' if( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT ) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 113bde97c..4c3595cef 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -2,9 +2,8 @@ # Copyright 2016 Advanced Micro Devices, Inc. # ######################################################################## -# We require 2.8.12 for linking libraries we specify PRIVATE, INTERFACE and -# PUBLIC keywords -cmake_minimum_required( VERSION 2.8.12 ) +# The ROCm platform requires Ubuntu 16.04 or Fedora 24, which has cmake 3.5 +cmake_minimum_required( VERSION 3.5 ) # MACOSX_RPATH is enabled by default policy if( POLICY CMP0042 )