osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

CMake: Update minimum required version to 3.13 

Windows already requires CMake 3.13. Bump the non-Windows
required version to 3.13 as well, since all our currently
supported Linux distributions have at least 3.13.

RHEL 8 and SUSE Enterprise 15 were initially released with
3.10 and 3.11, but have had updates with much more recent
versions since mid 2021 and mid 2020, respectively.
This commit is contained in:
John Thacker 2022-11-17 08:31:45 -05:00 committed by AndersBroman
parent 18b161c80f
commit d7ae26bf6c
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@ -15,15 +15,8 @@ if(DEFINED ENV{FORCE_CMAKE_NINJA_NON_VERBOSE})
unset(CMAKE_VERBOSE_MAKEFILE CACHE)
endif()
if(WIN32)
# Needed for add_custom_command() WORKING_DIRECTORY generator expressions
cmake_minimum_required(VERSION 3.13)
else()
cmake_minimum_required(VERSION 3.10)
endif()
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()
# Needed for add_custom_command() WORKING_DIRECTORY generator expressions
cmake_minimum_required(VERSION 3.13)
if(POLICY CMP0083)
cmake_policy(SET CMP0083 NEW)
endif()
@ -1142,18 +1135,10 @@ find_package(LEX REQUIRED)
find_package(Perl)
find_package(PCRE2 REQUIRED)
if(CMAKE_VERSION VERSION_LESS "3.12")
# Locate the Python interpreter. Finds the wrong (Python 2) version if:
# - PATH contains python3.6, but not python3 (3.4). Affects RHEL7+EPEL.
# - Path contains C:\Python27 but not C:\Python37 (which is installed,
# but not present in PATH).
find_package(PythonInterp 3.6 REQUIRED)
else()
find_package(Python3 3.6 REQUIRED)
# Several files (including LocatePythonModule) still use the old name
# from FindPythonInterp, let's stick to it for now.
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
endif()
find_package(Python3 3.6 REQUIRED)
# Several files (including LocatePythonModule) still use the old name
# from FindPythonInterp, let's stick to it for now.
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
if (NOT WIN32)
find_package(Gettext)