From 85135884d8767307e27fb2c0313228529fb6be76 Mon Sep 17 00:00:00 2001 From: Nabeel Meeramohideen Mohamed Date: Thu, 14 May 2020 18:13:21 -0500 Subject: [PATCH] Change mininum cmake version to 3.6. (cherry picked from commit 6e849ce6c7a653e94b79de21914228de7ff592c0) --- CMakeLists.txt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6064fb9..e76b923 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ # Copyright (C) 2015-2020 Micron Technology, Inc. All rights reserved. # -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.6) if(${CMAKE_MAJOR_VERSION} GREATER 2) cmake_policy(SET CMP0046 OLD) endif() @@ -63,13 +63,7 @@ include_directories( ${MPOOL_STAGE_INSTALL_PREFIX}/include ) # increasing warning levels set( CFLAGS_WARN_1 "${CFLAGS_WARN_0} -Wall -Werror -std=gnu99") - -if ( "${MPOOL_DISTRO}" STREQUAL "el6" ) - set( CFLAGS_WARN_2 "${CFLAGS_WARN_1} -Wlogical-op -Wno-missing-field-initializers -Wuninitialized -Wno-format-zero-length") -else() - set( CFLAGS_WARN_2 "${CFLAGS_WARN_1} -Wlogical-op -Wno-missing-field-initializers -Wuninitialized -Wmaybe-uninitialized ") -endif() - +set( CFLAGS_WARN_2 "${CFLAGS_WARN_1} -Wlogical-op -Wno-missing-field-initializers -Wuninitialized -Wmaybe-uninitialized ") set( CFLAGS_WARN_3 "${CFLAGS_WARN_2} -Wextra -Wno-conversion -Wno-sign-conversion -Wno-sign-compare -Wno-unused-parameter") set( CFLAGS_WARN_4 "${CFLAGS_WARN_2} -Wextra -Wconversion -Wsign-conversion -Wsign-compare -Wunused-parameter") set( CFLAGS_WARN_MAX "${CFLAGS_WARN_4}")