diff options
| author |   Andrej Rode <mail@andrejro.de> | 2019-05-15 09:31:51 -0700 |
|---|---|---|
| committer |   Martin Braun <martin.braun@ettus.com> | 2019-05-23 08:50:28 -0700 |
| commit | 8aea46ef64c29a468b8e3640cbf19af982cbf952 (patch) | |
| tree | c3faccb435cba6b01df9864a28b136c632db9adc | |
| parent | cmake: incorporate SO versioning from debian downstream patches (diff) | |
| download | gnuradio-8aea46ef64c29a468b8e3640cbf19af982cbf952.tar.xz gnuradio-8aea46ef64c29a468b8e3640cbf19af982cbf952.zip | |
cmake: remove branching for old CMake versions
Since only CMake 3.8 or greater is supported with this version of GNU
radio conditionals for older CMake versions are not necessary anymore
| -rw-r--r-- | cmake/Modules/GrMiscUtils.cmake | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake index 5dddc1ba2..853afaa8e 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -53,13 +53,11 @@ macro(GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE flag have) include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG(${flag} ${have}) if(${have}) - if(${CMAKE_VERSION} VERSION_GREATER "2.8.4") - STRING(FIND "${CMAKE_CXX_FLAGS}" "${flag}" flag_dup) - if(${flag_dup} EQUAL -1) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}") - endif(${flag_dup} EQUAL -1) - endif(${CMAKE_VERSION} VERSION_GREATER "2.8.4") + STRING(FIND "${CMAKE_CXX_FLAGS}" "${flag}" flag_dup) + if(${flag_dup} EQUAL -1) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}") + endif(${flag_dup} EQUAL -1) endif(${have}) endmacro(GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE) |