From e15bd5da7d61a58052a7ed75da6c1036b3c27f26 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Fri, 26 Jan 2018 20:47:33 +0100 Subject: [PATCH] carl9170 firmware tools: remove old gcc >= 4.4 check This check served its purpose. But the days of gcc 4.4 are long gone. It's no longer needed. Signed-off-by: Christian Lamparter --- extra/GCCVersion.cmake | 60 ------------------------------------------ tools/CMakeLists.txt | 13 +++------ 2 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 extra/GCCVersion.cmake diff --git a/extra/GCCVersion.cmake b/extra/GCCVersion.cmake deleted file mode 100644 index bb5fef3..0000000 --- a/extra/GCCVersion.cmake +++ /dev/null @@ -1,60 +0,0 @@ -#============================================================================= -# Copyright 2006-2009 Kitware, Inc. -# Copyright 2006-2008 Andreas Schneider -# Copyright 2007 Wengo -# Copyright 2007 Mike Jackson -# Copyright 2008 Andreas Pakulat -# Copyright 2008-2009 Philip Lowman -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the names of Kitware, Inc., the Insight Software Consortium, -# nor the names of their contributors may be used to endorse or promote -# products derived from this software without specific prior written -# permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#------------------------------------------------------------------------------- - -# -# Runs compiler with "-dumpversion" and parses major/minor -# version with a regex. -# -FUNCTION(_COMPILER_DUMPVERSION _OUTPUT_VERSION) - - EXEC_PROGRAM(${CMAKE_C_COMPILER} - ARGS ${CMAKE_C_COMPILER_ARG1} -dumpversion - OUTPUT_VARIABLE _COMPILER_VERSION - ) - STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2" - _COMPILER_VERSION ${_COMPILER_VERSION}) - - SET(${_OUTPUT_VERSION} ${_COMPILER_VERSION} PARENT_SCOPE) -ENDFUNCTION() - -# -# End functions/macros -# -#------------------------------------------------------------------------------- - - diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 4d9862d..13262d6 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -8,15 +8,8 @@ endif (CONFIG_CARL9170FW_MAKE_RELEASE) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/extra) -include(GCCVersion) include("../config.cmake") -_COMPILER_DUMPVERSION(_COMPILER_VERSION) - -if (("${_COMPILER_VERSION}" VERSION_GREATER 44) OR - ("${_COMPILER_VERSION}" VERSION_EQUAL 44)) - - include_directories (../include/linux ../include/shared ../include lib include) - add_subdirectory(lib) - add_subdirectory(src) -endif () +include_directories (../include/linux ../include/shared ../include lib include) +add_subdirectory(lib) +add_subdirectory(src) -- 2.31.1