gr39: Update main CMakeLists with 3.9 requirements/style

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
This commit is contained in:
Sylvain Munaut 2021-01-08 11:36:16 +01:00
parent 7caa2643e2
commit e9978be6cd
1 changed files with 16 additions and 6 deletions

View File

@ -9,8 +9,8 @@
# Project setup # Project setup
######################################################################## ########################################################################
cmake_minimum_required(VERSION 3.8) cmake_minimum_required(VERSION 3.8)
include(GNUInstallDirs)
project(gr-iqbalance CXX C) project(gr-iqbalance CXX C)
include(GNUInstallDirs)
enable_testing() enable_testing()
#policy setup #policy setup
@ -29,11 +29,11 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
# Find GNURadio # Find GNURadio
find_package(Gnuradio "3.8" REQUIRED) find_package(Gnuradio "3.9" REQUIRED)
# Set the version information here # Set the version information here
set(VERSION_MAJOR 3) set(VERSION_MAJOR 3)
set(VERSION_API 8) set(VERSION_API 9)
set(VERSION_ABI 0) set(VERSION_ABI 0)
set(VERSION_PATCH 0) set(VERSION_PATCH 0)
include(GrVersion) #setup version info include(GrVersion) #setup version info
@ -49,15 +49,25 @@ if((CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
endif() endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 14)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 14)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 14)
else() else()
message(WARNING "C++ standard could not be set because compiler is not GNU, Clang or MSVC.") message(WARNING "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
endif() endif()
if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
set(CMAKE_C_STANDARD 11)
elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
set(CMAKE_C_STANDARD 11)
elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_C_STANDARD 11)
else()
message(WARNING "C standard could not be set because compiler is not GNU, Clang or MSVC.")
endif()
######################################################################## ########################################################################
# Find boost # Find boost
######################################################################## ########################################################################