From 1acd29e4743765b1ed90ebd02dda08dedfb2bc33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Wed, 10 Aug 2022 16:37:28 +0300 Subject: [PATCH] platformio_pre.py fix for new cmake macros --- platformio_pre.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platformio_pre.py b/platformio_pre.py index aa681846..d8d56f87 100644 --- a/platformio_pre.py +++ b/platformio_pre.py @@ -65,10 +65,10 @@ version_h = ''' with open('CMakeLists.txt') as cm: str = cm.read() - v_major = re.findall(r'pip_MAJOR\s+(\d+)\)', str) - v_minor = re.findall(r'pip_MINOR\s+(\d+)\)', str) - v_rev = re.findall(r'pip_REVISION\s+(\d+)\)', str) - v_suffix = re.findall(r'pip_SUFFIX\s+(\w+)\)', str) + v_major = re.findall(r'PIP_MAJOR\s+(\d+)\)', str) + v_minor = re.findall(r'PIP_MINOR\s+(\d+)\)', str) + v_rev = re.findall(r'PIP_REVISION\s+(\d+)\)', str) + v_suffix = re.findall(r'PIP_SUFFIX\s+(\w+)\)', str) ver = '' ver = v_major[0]+'.'+v_minor[0]+'.'+v_rev[0] version_h.replace('${VERSION_MAJOR}', v_major[0])