From ad1666dd0aef3f9ac89175c75694d4fed2ec4dd6 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 30 Sep 2015 16:54:12 +0100
Subject: [PATCH] Fix double quotes in defines for Project Generator // Issue
 #294

---
 platformio/__init__.py                                  | 2 +-
 platformio/builder/tools/piomisc.py                     | 2 +-
 platformio/ide/projectgenerator.py                      | 1 +
 platformio/ide/tpls/clion/CMakeLists.txt.tpl            | 2 +-
 platformio/ide/tpls/visualstudio/platformio.vcxproj.tpl | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/platformio/__init__.py b/platformio/__init__.py
index 3ed50770..3547d272 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -1,7 +1,7 @@
 # Copyright (C) Ivan Kravets <me@ikravets.com>
 # See LICENSE for details.
 
-VERSION = (2, 3, "3.dev1")
+VERSION = (2, 3, "3.dev2")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py
index f54c317e..ae1e2323 100644
--- a/platformio/builder/tools/piomisc.py
+++ b/platformio/builder/tools/piomisc.py
@@ -147,7 +147,7 @@ def DumpIDEData(env):
     for item in env.get("CPPDEFINES", []):
         if isinstance(item, list):
             item = "=".join(item)
-        data['defines'].append(env.subst(item))
+        data['defines'].append(env.subst(item).replace('\\"', '"'))
 
     # special symbol for Atmel AVR MCU
     board = env.get("BOARD_OPTIONS", {})
diff --git a/platformio/ide/projectgenerator.py b/platformio/ide/projectgenerator.py
index 6597b41d..7e305092 100644
--- a/platformio/ide/projectgenerator.py
+++ b/platformio/ide/projectgenerator.py
@@ -125,6 +125,7 @@ class ProjectGenerator(object):
             "env_pathsep": os.pathsep,
             "env_path": self._fix_os_path(os.getenv("PATH"))
         })
+        print self._tplvars
 
     @staticmethod
     def _fix_os_path(path):
diff --git a/platformio/ide/tpls/clion/CMakeLists.txt.tpl b/platformio/ide/tpls/clion/CMakeLists.txt.tpl
index fe6d5807..b8e7ed62 100644
--- a/platformio/ide/tpls/clion/CMakeLists.txt.tpl
+++ b/platformio/ide/tpls/clion/CMakeLists.txt.tpl
@@ -13,7 +13,7 @@ include_directories("{{include}}")
 % end
 
 % for define in defines:
-add_definitions(-D{{define}})
+add_definitions(-D{{!define}})
 % end
 
 add_custom_target(
diff --git a/platformio/ide/tpls/visualstudio/platformio.vcxproj.tpl b/platformio/ide/tpls/visualstudio/platformio.vcxproj.tpl
index 75dc2f01..c0201b39 100644
--- a/platformio/ide/tpls/visualstudio/platformio.vcxproj.tpl
+++ b/platformio/ide/tpls/visualstudio/platformio.vcxproj.tpl
@@ -41,13 +41,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <NMakeBuildCommandLine>platformio -f -c visualstudio run</NMakeBuildCommandLine>
     <NMakeCleanCommandLine>platformio -f -c visualstudio run --target clean</NMakeCleanCommandLine>
-    <NMakePreprocessorDefinitions>{{";".join(defines)}}</NMakePreprocessorDefinitions>
+    <NMakePreprocessorDefinitions>{{!";".join(defines)}}</NMakePreprocessorDefinitions>
     <NMakeIncludeSearchPath>{{";".join(["$(HOMEDRIVE)$(HOMEPATH)%s" % i.replace(user_home_dir, "") if i.startswith(user_home_dir) else i for i in includes])}}</NMakeIncludeSearchPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <NMakeBuildCommandLine>platformio run</NMakeBuildCommandLine>
     <NMakeCleanCommandLine>platformio run --target clean</NMakeCleanCommandLine>
-    <NMakePreprocessorDefinitions>{";".join(defines)}}</NMakePreprocessorDefinitions>
+    <NMakePreprocessorDefinitions>{{!";".join(defines)}}</NMakePreprocessorDefinitions>
     <NMakeIncludeSearchPath>{{";".join(["$(HOMEDRIVE)$(HOMEPATH)%s" % i.replace(user_home_dir, "") if i.startswith(user_home_dir) else i for i in includes])}}</NMakeIncludeSearchPath>
   </PropertyGroup>
   <ItemDefinitionGroup>