From a9c7a27d47aeed6e227e4149580ddf0975a5cb70 Mon Sep 17 00:00:00 2001 From: Ilia Motornyi Date: Wed, 20 Oct 2021 18:08:22 +0300 Subject: [PATCH] Fix CLion 2021.3 support (#4085) New CMake behavior crashes CLion with apostrophe symbols in `add_definitions` clause see https://youtrack.jetbrains.com/issue/CPP-26719 --- platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl index a5c0010b..9df294ee 100644 --- a/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl +++ b/platformio/ide/tpls/clion/CMakeListsPrivate.txt.tpl @@ -75,7 +75,7 @@ set(CMAKE_CXX_STANDARD {{ cxx_stds[-1] }}) if (CMAKE_BUILD_TYPE MATCHES "{{ env_name }}") % for define in defines: - add_definitions(-D'{{!re.sub(r"([\"\(\)#])", r"\\\1", define)}}') + add_definitions(-D{{!re.sub(r"([\"\(\)#])", r"\\\1", define)}}) % end % for include in filter_includes(includes): @@ -99,7 +99,7 @@ endif() % for env, data in ide_data.items(): if (CMAKE_BUILD_TYPE MATCHES "{{ env }}") % for define in data["defines"]: - add_definitions(-D'{{!re.sub(r"([\"\(\)#])", r"\\\1", define)}}') + add_definitions(-D{{!re.sub(r"([\"\(\)#])", r"\\\1", define)}}) % end % for include in filter_includes(data["includes"]):