From 79a2b49c20acb794f89a3c5b1ab22d8fba2dc213 Mon Sep 17 00:00:00 2001 From: Maxim Pimenov Date: Wed, 16 Aug 2017 18:23:50 +0300 Subject: [PATCH] [qmake] Added bsdiff to the qmake project. --- 3party/3party.pro | 18 +++++++++++-- 3party/bsdiff-courgette/bsdiff-courgette.pro | 26 +++++++++++++++++++ .../mwm_diff_tests/mwm_diff_tests.pro | 2 +- 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 3party/bsdiff-courgette/bsdiff-courgette.pro diff --git a/3party/3party.pro b/3party/3party.pro index 01317bb8af..84d5a76588 100644 --- a/3party/3party.pro +++ b/3party/3party.pro @@ -7,8 +7,22 @@ TEMPLATE = subdirs CONFIG *= desktop } -SUBDIRS = freetype minizip jansson protobuf osrm expat succinct pugixml liboauthcpp stb_image sdf_image \ - icu agg +SUBDIRS = \ + agg \ + bsdiff-courgette \ + expat \ + freetype \ + icu \ + jansson \ + liboauthcpp \ + minizip \ + osrm \ + protobuf \ + pugixml \ + sdf_image \ + stb_image \ + succinct \ + # 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. diff --git a/3party/bsdiff-courgette/bsdiff-courgette.pro b/3party/bsdiff-courgette/bsdiff-courgette.pro new file mode 100644 index 0000000000..4d1b64273f --- /dev/null +++ b/3party/bsdiff-courgette/bsdiff-courgette.pro @@ -0,0 +1,26 @@ +TARGET = bsdiff +TEMPLATE = lib +CONFIG += staticlib + +ROOT_DIR = ../.. + +include($$ROOT_DIR/common.pri) + +INCLUDEPATH *= \ + bsdiff \ + divsufsort \ + +HEADERS += \ + bsdiff/bsdiff.h \ + bsdiff/bsdiff_common.h \ + bsdiff/bsdiff_search.h \ + bsdiff/paged_array.h \ + divsufsort/divsufsort.h \ + divsufsort/divsufsort_private.h \ + + +SOURCES += \ + divsufsort/divsufsort.cc \ + divsufsort/sssort.cc \ + divsufsort/trsort.cc \ + diff --git a/generator/mwm_diff/mwm_diff_tests/mwm_diff_tests.pro b/generator/mwm_diff/mwm_diff_tests/mwm_diff_tests.pro index b8bc5589a9..5413b7596d 100644 --- a/generator/mwm_diff/mwm_diff_tests/mwm_diff_tests.pro +++ b/generator/mwm_diff/mwm_diff_tests/mwm_diff_tests.pro @@ -4,7 +4,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../../.. -DEPENDENCIES = mwm_diff platform coding base stats_client +DEPENDENCIES = mwm_diff bsdiff platform coding base stats_client include($$ROOT_DIR/common.pri)