diff options
| author | Sergey Magidovich <mgsergio@mapswithme.com> | 2015-11-07 19:44:28 +0300 |
|---|---|---|
| committer | Sergey Magidovich <mgsergio@mapswithme.com> | 2015-11-08 09:39:36 +0300 |
| commit | 91eb20773459429aec8e50734e864923f5dbecd7 (patch) | |
| tree | 0c4a0dd346a9253ba3a4592f25c01e9384dc300f /3party | |
| parent | cf177797062c95e3c10afdbfe9d28901613589a4 (diff) | |
Fix broken project hierarchy. Now opening_hour_*_tests can be easily built.
Diffstat (limited to '3party')
| -rw-r--r-- | 3party/3party.pro | 28 | ||||
| -rw-r--r-- | 3party/opening_hours/opening_hours.cpp | 4 |
2 files changed, 19 insertions, 13 deletions
diff --git a/3party/3party.pro b/3party/3party.pro index 0d5ca49464..ce929599a4 100644 --- a/3party/3party.pro +++ b/3party/3party.pro @@ -2,24 +2,30 @@ TEMPLATE = subdirs -# TODO: Avoid duplication here and in omim.pro by moving -# opening_hours tests out of 3party. +# TODO: Avoid duplication here and in omim.pro by moving opening_hours tests out of 3party. !iphone*:!tizen*:!android* { CONFIG *= desktop } -SUBDIRS = freetype fribidi minizip jansson tomcrypt protobuf osrm expat \ - succinct \ +SUBDIRS = freetype fribidi minizip jansson tomcrypt protobuf osrm expat succinct -SUBDIRS += opening_hours +# TODO(mgsrergio): Move opening hours out of 3party to the main project tree. +# See https://trello.com/c/tWYSnXSS/22-opening-hours-3party-boost-test-framework. +SUBDIRS *= opening_hours CONFIG(desktop):!CONFIG(no-tests) { - SUBDIRS += opening_hours/opening_hours_tests \ - opening_hours/opening_hours_integration_tests \ - opening_hours/opening_hours_supported_features_tests + opening_hours_tests.subdir = opening_hours/opening_hours_tests + opening_hours_tests.depends = opening_hours + SUBDIRS *= opening_hours_tests + + opening_hours_integration_tests.subdir = opening_hours/opening_hours_integration_tests + opening_hours_integration_tests.depends = opening_hours + SUBDIRS *= opening_hours_integration_tests + + opening_hours_supported_features_tests.subdir = opening_hours/opening_hours_supported_features_tests + opening_hours_supported_features_tests.depends = opening_hours + SUBDIRS *= opening_hours_supported_features_tests } CONFIG(desktop) { - SUBDIRS += gflags \ - libtess2 \ - gmock + SUBDIRS *= gflags libtess2 gmock } diff --git a/3party/opening_hours/opening_hours.cpp b/3party/opening_hours/opening_hours.cpp index f78982a951..548d3bd7cf 100644 --- a/3party/opening_hours/opening_hours.cpp +++ b/3party/opening_hours/opening_hours.cpp @@ -24,11 +24,11 @@ #include "opening_hours.hpp" +#include <cstdlib> #include <iomanip> #include <ios> -#include <cstdlib> -#include <vector> #include <ostream> +#include <vector> namespace { |