From 338b51eae6c356c2e115a11db079020dd87bdfe0 Mon Sep 17 00:00:00 2001 From: Sergey Magidovich Date: Fri, 16 Oct 2015 12:17:28 +0300 Subject: [PATCH] opening_hours_tests does not break build any more. But opening_hours_tests should still be build manually. --- 3party/3party.pro | 6 ++++-- 3party/opening_hours/opening_hours.pro | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/3party/3party.pro b/3party/3party.pro index 5d9b8d4143..069de26ed1 100644 --- a/3party/3party.pro +++ b/3party/3party.pro @@ -6,8 +6,10 @@ SUBDIRS = freetype fribidi minizip jansson tomcrypt protobuf osrm expat \ succinct \ !linux* { -SUBDIRS += opening_hours \ - opening_hours/opening_hours_tests \ + SUBDIRS += opening_hours + CONFIG(desktop):!CONFIG(no-tests) { + SUBDIRS += opening_hours/opening_hours_tests + } } !iphone*:!tizen*:!android* { diff --git a/3party/opening_hours/opening_hours.pro b/3party/opening_hours/opening_hours.pro index 2f0250375a..1136266018 100644 --- a/3party/opening_hours/opening_hours.pro +++ b/3party/opening_hours/opening_hours.pro @@ -14,5 +14,4 @@ ROOT_DIR = ../.. include($$ROOT_DIR/common.pri) SOURCES += osm_time_range.cpp - HEADERS += osm_time_range.hpp