From 6d746fd2963a8461cb38efb4189388f96bf1f93e Mon Sep 17 00:00:00 2001 From: Aaron Rossetto Date: Thu, 6 Jan 2022 13:01:32 -0600 Subject: cmake: Replace distutils with CMake for version checks This commit replaces the use of distutils.version.LooseVersion() with CMake's version comparison operator, which implements relational version string checking in the same manner (i.e., comparing numeric components of a version string numerically). --- mpm/python/CMakeLists.txt | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'mpm/python') diff --git a/mpm/python/CMakeLists.txt b/mpm/python/CMakeLists.txt index b15578484..d5106b1b3 100644 --- a/mpm/python/CMakeLists.txt +++ b/mpm/python/CMakeLists.txt @@ -12,31 +12,37 @@ set(GEVENT_MIN_VERSION "1.4.0") set(PYUDEV_MIN_VERSION "0.21.0") -PYTHON_CHECK_MODULE( - "gevent ${GEVENT_MIN_VERSION} or greater" - "gevent" "LooseVersion(gevent.__version__) >= LooseVersion('${GEVENT_MIN_VERSION}')" +PYTHON_CHECK_MODULE_VERSION( + "gevent module" + "gevent" + "gevent.__version__" + ${GEVENT_MIN_VERSION} HAVE_PYTHON_MODULE_GEVENT ) # mprpc does not expose a __version__ attribute, so merely check for its -# presence. +# presence PYTHON_CHECK_MODULE( + "mprpc module" "mprpc" - "mprpc" "True" + "True" HAVE_PYTHON_MODULE_MPRPC ) -PYTHON_CHECK_MODULE( - "pyudev ${PYUDEV_MIN_VERSION} or greater" - "pyudev" "LooseVersion(pyudev.__version__) >= LooseVersion('${PYUDEV_MIN_VERSION}')" +PYTHON_CHECK_MODULE_VERSION( + "pyudev module" + "pyudev" + "pyudev.__version__" + ${PYUDEV_MIN_VERSION} HAVE_PYTHON_MODULE_PYUDEV ) # Older versions of pyroute2 (e.g. 0.5.2) do not expose a __version__ # attribute, so merely check for its presence. PYTHON_CHECK_MODULE( - "pyroute2" - "pyroute2" "True" + "pyroute2 module" + "pyroute2" + "True" HAVE_PYTHON_MODULE_PYROUTE2 ) -- cgit v1.2.3