From 3cf0bca870a53a5c52ac68199fe28d0813872b14 Mon Sep 17 00:00:00 2001 From: AbigailBuccaneer Date: Mon, 5 Mar 2018 20:57:58 +0000 Subject: [PATCH 1/2] Fix compiling with '-DFOO=' This fixes #21. --- json2cmake/__init__.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/json2cmake/__init__.py b/json2cmake/__init__.py index 369b1c9..4c1388d 100755 --- a/json2cmake/__init__.py +++ b/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) From 4c7fd020a29029065b1182990e8a9b4ce3122cf0 Mon Sep 17 00:00:00 2001 From: AbigailBuccaneer Date: Mon, 12 Mar 2018 21:02:38 +0000 Subject: [PATCH 2/2] Bump version to v0.6.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 30f1a36..9e1b6ee 100644 --- a/setup.py +++ b/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',