Merge pull request #22 from AbigailBuccaneer/fix/21

 Fix compiling with '-DFOO='

json2cmake/__init__.py

@@ -32,7 +32,7 @@ def parsecommand(command, resolvepath):
     next(words)  # remove the initial 'cc' / 'c++'
 
     options = []
-    defines = {}
+    defines = []
     includes = []
     system_includes = set()
 
@@ -50,10 +50,7 @@ def parsecommand(command, resolvepath):
                 includes.append(include)
             system_includes.add(include)
         elif word.startswith('-D'):
-            key, _, value = word[2:].partition('=')
-            if value == '':
-                value = True
-            defines[key] = value
+            defines.append(word[2:])
         elif word == '-c':
             continue
         elif word.startswith('-'):
@@ -112,11 +109,8 @@ def write(self, output, directory=None, name='autogenerated'):
             output.write(')\n')
 
             output.write('target_compile_definitions(%s PRIVATE\n' % name)
-            for (define, value) in config['defines']:
-                str = define
-                if value is not True:
-                    str = str + '=' + value
-                output.write('    %s\n' % str)
+            for define in config['defines']:
+                output.write('    %s\n' % define)
             output.write(')\n')
 
             output.write('target_include_directories(%s PRIVATE\n' % name)

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='json2cmake',
-    version='0.6.0',
+    version='0.6.1',
     description='Generate CMakeLists.txt from a compile_commands.json',
     long_description=long_description,
     url='https://github.com/AbigailBuccaneer/json2cmake',