diff options
| author | Yury Melnichek <melnichek@gmail.com> | 2011-03-06 14:08:58 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:12:57 +0300 |
| commit | 2cbf9325c48e87d4c277feb9e4926a12698c1236 (patch) | |
| tree | 433474cba4980c8a55a161f64f3ad2002c6562c6 /publisher | |
| parent | 5d9239a1edede8693c69119e282017d965d2c326 (diff) | |
Merge 3party and 3party_sloynik. Remove sloynik_common.pri.
Diffstat (limited to 'publisher')
| -rw-r--r-- | publisher/aard_dictionary.cpp | 2 | ||||
| -rw-r--r-- | publisher/publisher.pro | 4 | ||||
| -rw-r--r-- | publisher/publisher_tests/publisher_tests.pro | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/publisher/aard_dictionary.cpp b/publisher/aard_dictionary.cpp index e39bafa8c9..47e98a9001 100644 --- a/publisher/aard_dictionary.cpp +++ b/publisher/aard_dictionary.cpp @@ -4,7 +4,7 @@ #include "../coding/endianness.hpp" #include "../coding/reader.hpp" #include "../base/logging.hpp" -#include "../3party_sloynik/jansson/myjansson.hpp" +#include "../3party/jansson/myjansson.hpp" #include "../std/exception.hpp" namespace diff --git a/publisher/publisher.pro b/publisher/publisher.pro index 1acc92085e..e629b513b5 100644 --- a/publisher/publisher.pro +++ b/publisher/publisher.pro @@ -3,10 +3,10 @@ TEMPLATE = app CONFIG += console CONFIG -= app_bundle -SLOYNIK_DIR = .. +ROOT_DIR = .. DEPENDENCIES = gflags bzip2 zlib jansson base coding coding_sloynik words -include($$SLOYNIK_DIR/sloynik_common.pri) +include($$ROOT_DIR/common.pri) HEADERS += \ aard_dictionary.hpp \ diff --git a/publisher/publisher_tests/publisher_tests.pro b/publisher/publisher_tests/publisher_tests.pro index 5b46a73c1b..b3ea6bb6b2 100644 --- a/publisher/publisher_tests/publisher_tests.pro +++ b/publisher/publisher_tests/publisher_tests.pro @@ -3,12 +3,12 @@ TEMPLATE = app CONFIG += console CONFIG -= app_bundle -SLOYNIK_DIR = ../.. +ROOT_DIR = ../.. DEPENDENCIES = gflags bzip2 zlib base coding coding_sloynik words -include($$SLOYNIK_DIR/sloynik_common.pri) +include($$ROOT_DIR/common.pri) -SOURCES += $$SLOYNIK_DIR/testing/testingmain.cpp \ +SOURCES += $$ROOT_DIR/testing/testingmain.cpp \ slof_indexer_test.cpp ../slof_indexer.cpp HEADERS += |