move cflags out

This commit is contained in:
Peter Braden 2012-09-24 14:49:16 -07:00
parent cb7a49b4f1
commit 6a6fb0ea7e
2 changed files with 8 additions and 14 deletions

View File

@ -7,3 +7,4 @@ before_install:
- sudo apt-get install libhighgui-dev - sudo apt-get install libhighgui-dev
- pkg-config --libs opencv - pkg-config --libs opencv
- pkg-config --cflags opencv - pkg-config --cflags opencv
- ls /usr/include

View File

@ -13,6 +13,12 @@
, 'libraries': [ , 'libraries': [
'<!@(pkg-config --libs opencv)' '<!@(pkg-config --libs opencv)'
] ]
, 'cflags': [
'<!@(pkg-config --cflags opencv)'
, '-Wall'
]
, 'cflags!' : [ '-fno-exceptions']
, 'cflags_cc!': [ '-fno-rtti', '-fno-exceptions']
, "conditions": [ , "conditions": [
['OS=="mac"', { ['OS=="mac"', {
# cflags on OS X are stupid and have to be defined like this # cflags on OS X are stupid and have to be defined like this
@ -22,22 +28,9 @@
] ]
, "GCC_ENABLE_CPP_RTTI": "YES" , "GCC_ENABLE_CPP_RTTI": "YES"
, "GCC_ENABLE_CPP_EXCEPTIONS": "YES" , "GCC_ENABLE_CPP_EXCEPTIONS": "YES"
}, }
}, {
'cflags': [
'<!@(pkg-config --cflags opencv)'
, '-Wall'
]
, 'cflags!' : [ '-fno-exceptions']
, 'cflags_cc!': [ '-fno-rtti', '-fno-exceptions']
}] }]
, ['OS=="linux"', {
'cflags': ['<!@(pkg-config --cflags opencv)']
, 'cflags!' : ['-fno-exceptions']
, 'cflags_cc!' : ['-fno-rtti', '-fno-exceptions']
}]
] ]
}] }]
} }