From 57b5cca27ff6b2e0c1c94138bc43ee24ab4cb6d0 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Fri, 3 Mar 2023 15:36:40 +0100 Subject: [PATCH] Downgrade CMake requirements to 3.16. Detects correctly Python 3. Fix courtesy of N. Shimizu. --- Seabreeze/CMakeLists.txt | 4 ++-- anabatic/CMakeLists.txt | 4 ++-- bootstrap/CMakeLists.txt | 5 +++-- bora/CMakeLists.txt | 4 ++-- coloquinte/CMakeLists.txt | 2 +- crlcore/CMakeLists.txt | 4 ++-- cumulus/CMakeLists.txt | 4 ++-- deprecated/katabatic/CMakeLists.txt | 4 ++-- deprecated/kite/CMakeLists.txt | 4 ++-- deprecated/knik/CMakeLists.txt | 2 +- deprecated/mauka/CMakeLists.txt | 4 ++-- deprecated/metis/CMakeLists.txt | 4 ++-- deprecated/nimbus/CMakeLists.txt | 4 ++-- deprecated/vlsisapd/CMakeLists.txt | 4 ++-- documentation/CMakeLists.txt | 2 +- documentation/examples/code/engine/smurf/CMakeLists.txt | 2 +- equinox/CMakeLists.txt | 2 +- etesian/CMakeLists.txt | 4 ++-- flute/CMakeLists.txt | 4 ++-- foehn/CMakeLists.txt | 4 ++-- hurricane/CMakeLists.txt | 4 ++-- ispd/CMakeLists.txt | 4 ++-- karakaze/CMakeLists.txt | 4 ++-- katana/CMakeLists.txt | 4 ++-- lefdef/CMakeLists.txt | 2 +- oroshi/CMakeLists.txt | 4 ++-- solstice/CMakeLists.txt | 2 +- stratus1/CMakeLists.txt | 4 ++-- tutorial/CMakeLists.txt | 4 ++-- unicorn/CMakeLists.txt | 4 ++-- unittests/CMakeLists.txt | 4 ++-- 31 files changed, 56 insertions(+), 55 deletions(-) diff --git a/Seabreeze/CMakeLists.txt b/Seabreeze/CMakeLists.txt index 185a1b76..4ac37b2f 100644 --- a/Seabreeze/CMakeLists.txt +++ b/Seabreeze/CMakeLists.txt @@ -7,7 +7,7 @@ option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") @@ -20,7 +20,7 @@ setup_qt() find_package(Libexecinfo REQUIRED) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(LEFDEF REQUIRED) find_package(FLUTE REQUIRED) diff --git a/anabatic/CMakeLists.txt b/anabatic/CMakeLists.txt index cd4f87de..dce068a6 100644 --- a/anabatic/CMakeLists.txt +++ b/anabatic/CMakeLists.txt @@ -9,7 +9,7 @@ option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) @@ -19,7 +19,7 @@ setup_boost() setup_qt() - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(FLUTE REQUIRED) find_package(HURRICANE REQUIRED) diff --git a/bootstrap/CMakeLists.txt b/bootstrap/CMakeLists.txt index aa8d1b2b..5ac1ba25 100644 --- a/bootstrap/CMakeLists.txt +++ b/bootstrap/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(Bootstrap) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables USE_LIBBFD "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") @@ -11,7 +11,8 @@ list(INSERT CMAKE_MODULE_PATH 0 "${Bootstrap_SOURCE_DIR}/cmake_modules/") find_package(Bootstrap REQUIRED) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module ) + # find_package(Python 3 REQUIRED COMPONENTS Interpreter Development ) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development ) find_package(PythonSitePackages REQUIRED) print_cmake_module_path() diff --git a/bora/CMakeLists.txt b/bora/CMakeLists.txt index c19788b0..c0b0d7fc 100644 --- a/bora/CMakeLists.txt +++ b/bora/CMakeLists.txt @@ -6,7 +6,7 @@ option(BUILD_DOC "Build the documentation (doxygen)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") @@ -20,7 +20,7 @@ setup_qwt() find_package(Libexecinfo REQUIRED) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(LEFDEF REQUIRED) find_package(FLUTE REQUIRED) diff --git a/coloquinte/CMakeLists.txt b/coloquinte/CMakeLists.txt index 32166426..b2e6638e 100644 --- a/coloquinte/CMakeLists.txt +++ b/coloquinte/CMakeLists.txt @@ -8,7 +8,7 @@ #option(BUILD_DOC "Build the documentation (doxygen)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt index aea87892..8a637c51 100644 --- a/crlcore/CMakeLists.txt +++ b/crlcore/CMakeLists.txt @@ -5,7 +5,7 @@ set(ignoreVariables "${CMAKE_INSTALL_DIR}") - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) OPTION(BUILD_DOC "Build the documentation (latex+doxygen)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) @@ -28,7 +28,7 @@ find_package(Libbfd) endif() find_package(BZip2 REQUIRED) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(BISON REQUIRED) find_package(FLEX REQUIRED) diff --git a/cumulus/CMakeLists.txt b/cumulus/CMakeLists.txt index 5a242426..016becef 100644 --- a/cumulus/CMakeLists.txt +++ b/cumulus/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(CUMULUS) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${BUILD_DOC}" "${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) @@ -15,7 +15,7 @@ set_cmake_policies() setup_sysconfdir("${CMAKE_INSTALL_PREFIX}") - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED) diff --git a/deprecated/katabatic/CMakeLists.txt b/deprecated/katabatic/CMakeLists.txt index cd07814c..2fbd6b9e 100644 --- a/deprecated/katabatic/CMakeLists.txt +++ b/deprecated/katabatic/CMakeLists.txt @@ -7,7 +7,7 @@ option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${CMAKE_INSTALL_DIR}") @@ -19,7 +19,7 @@ setup_boost(program_options) setup_qt() - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(FLUTE REQUIRED) find_package(HURRICANE REQUIRED) diff --git a/deprecated/kite/CMakeLists.txt b/deprecated/kite/CMakeLists.txt index 650afd46..94fb97b2 100644 --- a/deprecated/kite/CMakeLists.txt +++ b/deprecated/kite/CMakeLists.txt @@ -7,7 +7,7 @@ option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${CMAKE_INSTALL_DIR}") @@ -19,7 +19,7 @@ setup_boost(program_options) setup_qt() - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(FLUTE REQUIRED) find_package(LEFDEF REQUIRED) diff --git a/deprecated/knik/CMakeLists.txt b/deprecated/knik/CMakeLists.txt index 06c4a660..4cb6a5ab 100644 --- a/deprecated/knik/CMakeLists.txt +++ b/deprecated/knik/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(KNIK) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/deprecated/mauka/CMakeLists.txt b/deprecated/mauka/CMakeLists.txt index 326e2bfe..c7678924 100644 --- a/deprecated/mauka/CMakeLists.txt +++ b/deprecated/mauka/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(MAUKA) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") @@ -15,7 +15,7 @@ setup_boost(program_options) setup_qt() - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED) diff --git a/deprecated/metis/CMakeLists.txt b/deprecated/metis/CMakeLists.txt index 159d9436..af0f847f 100644 --- a/deprecated/metis/CMakeLists.txt +++ b/deprecated/metis/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(METIS) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") @@ -14,7 +14,7 @@ set_cmake_policies() setup_boost() - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED) diff --git a/deprecated/nimbus/CMakeLists.txt b/deprecated/nimbus/CMakeLists.txt index deaac46b..32619a78 100644 --- a/deprecated/nimbus/CMakeLists.txt +++ b/deprecated/nimbus/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(NIMBUS) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") @@ -14,7 +14,7 @@ setup_boost(program_options) setup_qt() - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED) diff --git a/deprecated/vlsisapd/CMakeLists.txt b/deprecated/vlsisapd/CMakeLists.txt index f2fc39f6..b7cfae82 100644 --- a/deprecated/vlsisapd/CMakeLists.txt +++ b/deprecated/vlsisapd/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(VLSISAPD) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) @@ -18,7 +18,7 @@ setup_boost(program_options python) find_package(LibXml2 REQUIRED) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(BISON REQUIRED) find_package(FLEX REQUIRED) diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt index 275d6efa..d7706e15 100644 --- a/documentation/CMakeLists.txt +++ b/documentation/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(DOCUMENTATION) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${LIB_SUFFIX} ${CMAKE_INSTALL_DIR}") diff --git a/documentation/examples/code/engine/smurf/CMakeLists.txt b/documentation/examples/code/engine/smurf/CMakeLists.txt index 3575461f..f98d4698 100644 --- a/documentation/examples/code/engine/smurf/CMakeLists.txt +++ b/documentation/examples/code/engine/smurf/CMakeLists.txt @@ -4,7 +4,7 @@ option(BUILD_DOC "Build the documentation (doxygen)" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) diff --git a/equinox/CMakeLists.txt b/equinox/CMakeLists.txt index 8ad3ff24..a757bb8d 100644 --- a/equinox/CMakeLists.txt +++ b/equinox/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(EQUINOX) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/etesian/CMakeLists.txt b/etesian/CMakeLists.txt index f06850bc..35eeda18 100644 --- a/etesian/CMakeLists.txt +++ b/etesian/CMakeLists.txt @@ -8,7 +8,7 @@ #option(BUILD_DOC "Build the documentation (doxygen)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) @@ -18,7 +18,7 @@ set_cmake_policies() setup_boost(program_options) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(HURRICANE REQUIRED) #find_package(KATABATIC REQUIRED) diff --git a/flute/CMakeLists.txt b/flute/CMakeLists.txt index fd765b09..b8f55141 100644 --- a/flute/CMakeLists.txt +++ b/flute/CMakeLists.txt @@ -3,7 +3,7 @@ set( CMAKE_LEGACY_CYGWIN_WIN32 0 ) project( FLUTE ) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set( ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}" ) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) @@ -17,7 +17,7 @@ check_distribution() setup_sysconfdir( "${CMAKE_INSTALL_PREFIX}" ) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED) diff --git a/foehn/CMakeLists.txt b/foehn/CMakeLists.txt index df180724..6bc7e2cc 100644 --- a/foehn/CMakeLists.txt +++ b/foehn/CMakeLists.txt @@ -7,7 +7,7 @@ option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") @@ -20,7 +20,7 @@ setup_qt() find_package(Libexecinfo REQUIRED) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(LEFDEF REQUIRED) find_package(FLUTE REQUIRED) diff --git a/hurricane/CMakeLists.txt b/hurricane/CMakeLists.txt index 1d61071f..d398d482 100644 --- a/hurricane/CMakeLists.txt +++ b/hurricane/CMakeLists.txt @@ -8,7 +8,7 @@ option(BUILD_DOC "Build the documentation (doxygen)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules") find_package(RapidJSON REQUIRED) @@ -24,7 +24,7 @@ find_package(BZip2 REQUIRED) find_package(BISON REQUIRED) find_package(FLEX REQUIRED) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module ) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development ) find_package(PythonSitePackages REQUIRED) find_package(Libexecinfo REQUIRED) if (USE_LIBBFD) diff --git a/ispd/CMakeLists.txt b/ispd/CMakeLists.txt index 9793382e..4ccc9c26 100644 --- a/ispd/CMakeLists.txt +++ b/ispd/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(ISPD) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) @@ -17,7 +17,7 @@ set(QT_USE_QTXML "true") find_package(Qt4 REQUIRED) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED) diff --git a/karakaze/CMakeLists.txt b/karakaze/CMakeLists.txt index d6bbff4c..bbaa19d3 100644 --- a/karakaze/CMakeLists.txt +++ b/karakaze/CMakeLists.txt @@ -2,7 +2,7 @@ project(KARAKAZE) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${BUILD_DOC}" "${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) @@ -15,7 +15,7 @@ check_distribution() setup_sysconfdir("${CMAKE_INSTALL_PREFIX}") - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED) diff --git a/katana/CMakeLists.txt b/katana/CMakeLists.txt index f8660c58..c196c67c 100644 --- a/katana/CMakeLists.txt +++ b/katana/CMakeLists.txt @@ -7,7 +7,7 @@ option(CHECK_DATABASE "Run database in full check mode (very slow)" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") @@ -20,7 +20,7 @@ setup_qt() find_package(Libexecinfo REQUIRED) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(LEFDEF REQUIRED) find_package(FLUTE REQUIRED) diff --git a/lefdef/CMakeLists.txt b/lefdef/CMakeLists.txt index b2fed8bb..dd9999e5 100644 --- a/lefdef/CMakeLists.txt +++ b/lefdef/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(LEFDEF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/oroshi/CMakeLists.txt b/oroshi/CMakeLists.txt index d74de7e8..d5f6890d 100644 --- a/oroshi/CMakeLists.txt +++ b/oroshi/CMakeLists.txt @@ -2,7 +2,7 @@ project(OROSHI) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) set(ignoreVariables "${CMAKE_INSTALL_DIR}") @@ -18,7 +18,7 @@ if (USE_LIBBFD) find_package(Libbfd) endif() - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED) diff --git a/solstice/CMakeLists.txt b/solstice/CMakeLists.txt index 73a4b8aa..e475b5f5 100644 --- a/solstice/CMakeLists.txt +++ b/solstice/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0) project(SOLSTICE) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) diff --git a/stratus1/CMakeLists.txt b/stratus1/CMakeLists.txt index 6857cab7..4b10fcff 100644 --- a/stratus1/CMakeLists.txt +++ b/stratus1/CMakeLists.txt @@ -8,7 +8,7 @@ set(ignoreVariables "${BUILD_DOC}" "${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") find_package(Bootstrap REQUIRED) setup_project_paths(CORIOLIS) @@ -19,7 +19,7 @@ cmake_policy(SET CMP0002 OLD) setup_sysconfdir("${CMAKE_INSTALL_PREFIX}") - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED) diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt index 70633387..293de9a5 100644 --- a/tutorial/CMakeLists.txt +++ b/tutorial/CMakeLists.txt @@ -5,7 +5,7 @@ option(BUILD_DOC "Build the documentation (doxygen)" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${LIB_SUFFIX} ${BUILD_DOC} ${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) @@ -19,7 +19,7 @@ setup_qt() find_package(Libexecinfo REQUIRED) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(LEFDEF REQUIRED) find_package(HURRICANE REQUIRED) diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt index b9a1885a..8c407065 100644 --- a/unicorn/CMakeLists.txt +++ b/unicorn/CMakeLists.txt @@ -5,7 +5,7 @@ option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) @@ -24,7 +24,7 @@ find_package(Libbfd) endif() find_package(BZip2 REQUIRED) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(LEFDEF REQUIRED) find_package(COLOQUINTE) diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index fdcc7c02..e3287790 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -4,7 +4,7 @@ project(UNITTEST) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) - cmake_minimum_required(VERSION 3.18) + cmake_minimum_required(VERSION 3.16) set(ignoreVariables "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) @@ -27,7 +27,7 @@ endif() find_package(Libexecinfo REQUIRED) find_package(BZip2 REQUIRED) - find_package(Python 3 REQUIRED COMPONENTS Interpreter Development.Module) + find_package(Python 3 REQUIRED COMPONENTS Interpreter Development) find_package(PythonSitePackages REQUIRED) find_package(LEFDEF) find_package(HURRICANE REQUIRED)