pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fix broken project hierarchy. Now opening_hour_*_tests can be easily built.

Browse source
This commit is contained in:
Sergey Magidovich 2015-11-07 19:44:28 +03:00
parent cf17779706
commit 91eb207734
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
3party/3party.pro
View file

@ -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
}

4
3party/opening_hours/opening_hours.cpp
View file

@ -24,11 +24,11 @@
#include "opening_hours.hpp"
#include <cstdlib>
#include <iomanip>
#include <ios>
#include <cstdlib>
#include <vector>
#include <ostream>
#include <vector>
namespace
{