From 412a1f78cd72c36cd7ed5da0636b608d0c49e15a Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 4 Jul 2019 20:07:44 +0300 Subject: [PATCH] Fixed an issue when generating invalid "Eclipse CDT Cross GCC Built-in Compiler Settings" if a custom PLATFORMIO_CORE_DIR is used // Resolve #806 --- HISTORY.rst | 3 ++- .../.settings/language.settings.xml.tpl | 20 +++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index a4d8907d..df69c43c 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -63,7 +63,8 @@ PlatformIO 4.0 - Support custom CMake configuration for CLion IDE using ``CMakeListsUser.txt`` file - Fixed an issue with hardcoded C standard version when generating project for CLion IDE (`issue #2527 `_) - - Fixed an issue with Project Generator when include path search order is inconsistent to what passed to the compiler (`issue #2509 `_) + - Fixed an issue with Project Generator when an include path search order is inconsistent to what passed to the compiler (`issue #2509 `_) + - Fixed an issue when generating invalid "Eclipse CDT Cross GCC Built-in Compiler Settings" if a custom `PLATFORMIO_CORE_DIR `__ is used (`issue #806 `_) * **Miscellaneous** diff --git a/platformio/ide/tpls/eclipse/.settings/language.settings.xml.tpl b/platformio/ide/tpls/eclipse/.settings/language.settings.xml.tpl index a119c8b2..eefe1a52 100644 --- a/platformio/ide/tpls/eclipse/.settings/language.settings.xml.tpl +++ b/platformio/ide/tpls/eclipse/.settings/language.settings.xml.tpl @@ -3,6 +3,14 @@ % cxx_stds = STD_RE.findall(cxx_flags) % cxx_std = cxx_stds[-1] if cxx_stds else "" % +% if cxx_path.startswith(user_home_dir): +% if "windows" in systype: +% cxx_path = "${USERPROFILE}" + cxx_path.replace(user_home_dir, "") +% else: +% cxx_path = "${HOME}" + cxx_path.replace(user_home_dir, "") +% end +% end +% @@ -10,11 +18,7 @@ - % if "windows" in systype: - - % else: - - % end + @@ -25,11 +29,7 @@ - % if "windows" in systype: - - % else: - - % end +