diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-07-15 11:16:54 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-07-15 11:16:54 -0400 |
| commit | d1977dc53f3cd7ec4e85bf589d29c40ca7812c84 (patch) | |
| tree | 890576dfeec10424ed57388f9debec0535f53e16 /test/test.gyp | |
| parent | b327a2cb34b0977f03f6d7bb2d7fca4537192539 (diff) | |
| parent | 471dafc1d1e453efa09f6d0e213ee5f8601cd754 (diff) | |
| download | qtlocation-mapboxgl-d1977dc53f3cd7ec4e85bf589d29c40ca7812c84.tar.gz | |
Merge branch 'master' into fuzz-pipe
Conflicts:
test/test.gyp
Diffstat (limited to 'test/test.gyp')
| -rw-r--r-- | test/test.gyp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/test/test.gyp b/test/test.gyp index d68b4344cd..1a3915131c 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -91,6 +91,22 @@ ] }, { + "target_name": "enums", + "product_name": "test_enums", + "type": "executable", + "libraries": [ + "-lpthread", + ], + "sources": [ + "./main.cpp", + "./enums.cpp", + ], + "dependencies": [ + "../deps/gtest/gtest.gyp:gtest", + "../llmr.gyp:llmr-x86" + ] + }, + { "target_name": "style", "product_name": "test_style", "type": "executable", @@ -185,6 +201,7 @@ "dependencies": [ "rotation_range", "clip_ids", + "enums", "variant", "tile", "functions", |