From c339e5c9e33f074f4936f751418ab702cf169d76 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Tue, 11 Jul 2017 17:52:58 +0200 Subject: [PATCH] Check for any version of Python 2, instead of 2.7. --- anabatic/CMakeLists.txt | 2 +- crlcore/CMakeLists.txt | 2 +- cumulus/CMakeLists.txt | 2 +- etesian/CMakeLists.txt | 2 +- hurricane/CMakeLists.txt | 2 +- ispd/CMakeLists.txt | 2 +- katabatic/CMakeLists.txt | 2 +- katana/CMakeLists.txt | 2 +- kite/CMakeLists.txt | 2 +- mauka/CMakeLists.txt | 2 +- metis/CMakeLists.txt | 2 +- nimbus/CMakeLists.txt | 2 +- stratus1/CMakeLists.txt | 2 +- unicorn/CMakeLists.txt | 2 +- vlsisapd/CMakeLists.txt | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/anabatic/CMakeLists.txt b/anabatic/CMakeLists.txt index 4187e409..e3fd6956 100644 --- a/anabatic/CMakeLists.txt +++ b/anabatic/CMakeLists.txt @@ -17,7 +17,7 @@ setup_boost() setup_qt() - find_package(PythonLibs REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(VLSISAPD REQUIRED) find_package(HURRICANE REQUIRED) diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt index 283684bb..6e2f1e68 100644 --- a/crlcore/CMakeLists.txt +++ b/crlcore/CMakeLists.txt @@ -21,7 +21,7 @@ setup_qt() find_package(LibXml2 REQUIRED) - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(BISON REQUIRED) find_package(FLEX REQUIRED) diff --git a/cumulus/CMakeLists.txt b/cumulus/CMakeLists.txt index 2bf8c2ed..c82782ba 100644 --- a/cumulus/CMakeLists.txt +++ b/cumulus/CMakeLists.txt @@ -12,7 +12,7 @@ set_lib_link_mode() setup_sysconfdir("${CMAKE_INSTALL_PREFIX}") - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(VLSISAPD REQUIRED) find_package(HURRICANE REQUIRED) diff --git a/etesian/CMakeLists.txt b/etesian/CMakeLists.txt index ccab5323..a0774765 100644 --- a/etesian/CMakeLists.txt +++ b/etesian/CMakeLists.txt @@ -16,7 +16,7 @@ set_lib_link_mode() setup_boost(program_options python regex) - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(VLSISAPD REQUIRED) find_package(HURRICANE REQUIRED) diff --git a/hurricane/CMakeLists.txt b/hurricane/CMakeLists.txt index b412ea6f..368368bc 100644 --- a/hurricane/CMakeLists.txt +++ b/hurricane/CMakeLists.txt @@ -21,7 +21,7 @@ find_package(BZip2 REQUIRED) find_package(BISON REQUIRED) find_package(FLEX REQUIRED) - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(VLSISAPD REQUIRED) find_package(Libexecinfo REQUIRED) diff --git a/ispd/CMakeLists.txt b/ispd/CMakeLists.txt index b5e2a90c..801f1f7d 100644 --- a/ispd/CMakeLists.txt +++ b/ispd/CMakeLists.txt @@ -17,7 +17,7 @@ find_package(LibXml2 REQUIRED) set(QT_USE_QTXML "true") find_package(Qt4 REQUIRED) - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(VLSISAPD REQUIRED) find_package(HURRICANE REQUIRED) diff --git a/katabatic/CMakeLists.txt b/katabatic/CMakeLists.txt index 70f328cd..2b180ab3 100644 --- a/katabatic/CMakeLists.txt +++ b/katabatic/CMakeLists.txt @@ -17,7 +17,7 @@ setup_boost(program_options filesystem python regex) setup_qt() - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(VLSISAPD REQUIRED) find_package(HURRICANE REQUIRED) diff --git a/katana/CMakeLists.txt b/katana/CMakeLists.txt index 5cd3617c..bcbf4e0e 100644 --- a/katana/CMakeLists.txt +++ b/katana/CMakeLists.txt @@ -19,7 +19,7 @@ find_package(Libexecinfo REQUIRED) find_package(LibXml2 REQUIRED) - find_package(PythonLibs REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(LEFDEF REQUIRED) find_package(VLSISAPD REQUIRED) diff --git a/kite/CMakeLists.txt b/kite/CMakeLists.txt index 5ba6993d..68fafdb8 100644 --- a/kite/CMakeLists.txt +++ b/kite/CMakeLists.txt @@ -18,7 +18,7 @@ setup_qt() find_package(LibXml2 REQUIRED) - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(VLSISAPD REQUIRED) find_package(LEFDEF REQUIRED) diff --git a/mauka/CMakeLists.txt b/mauka/CMakeLists.txt index 47b944b6..d9b1c259 100644 --- a/mauka/CMakeLists.txt +++ b/mauka/CMakeLists.txt @@ -15,7 +15,7 @@ setup_boost(program_options filesystem regex python) setup_qt() - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(VLSISAPD REQUIRED) find_package(HURRICANE REQUIRED) diff --git a/metis/CMakeLists.txt b/metis/CMakeLists.txt index bc10d065..55eb8c00 100644 --- a/metis/CMakeLists.txt +++ b/metis/CMakeLists.txt @@ -14,7 +14,7 @@ set_lib_link_mode() setup_boost() - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(VLSISAPD REQUIRED) find_package(HURRICANE REQUIRED) diff --git a/nimbus/CMakeLists.txt b/nimbus/CMakeLists.txt index 6f0d7764..aeb12c41 100644 --- a/nimbus/CMakeLists.txt +++ b/nimbus/CMakeLists.txt @@ -14,7 +14,7 @@ setup_boost(program_options filesystem python regex) setup_qt() - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(VLSISAPD REQUIRED) find_package(HURRICANE REQUIRED) diff --git a/stratus1/CMakeLists.txt b/stratus1/CMakeLists.txt index aac721ee..6685cdeb 100644 --- a/stratus1/CMakeLists.txt +++ b/stratus1/CMakeLists.txt @@ -17,7 +17,7 @@ set_lib_link_mode() setup_sysconfdir("${CMAKE_INSTALL_PREFIX}") - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(VLSISAPD REQUIRED) find_package(HURRICANE REQUIRED) diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt index cd53b09b..d6f3bfce 100644 --- a/unicorn/CMakeLists.txt +++ b/unicorn/CMakeLists.txt @@ -17,7 +17,7 @@ find_package(Libbfd) find_package(LibXml2 REQUIRED) - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) find_package(LEFDEF REQUIRED) find_package(COLOQUINTE) diff --git a/vlsisapd/CMakeLists.txt b/vlsisapd/CMakeLists.txt index 61fd8bda..22bc29c1 100644 --- a/vlsisapd/CMakeLists.txt +++ b/vlsisapd/CMakeLists.txt @@ -16,7 +16,7 @@ find_package(LibXml2 REQUIRED) find_package(PythonSitePackages REQUIRED) - find_package(PythonLibs 2.7 REQUIRED) + find_package(PythonLibs 2 REQUIRED) find_package(BISON REQUIRED) find_package(FLEX REQUIRED) find_package(Doxygen)