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

Merge pull request #527 from deathbaba/linux-qmake-build-fix

Browse source 
Fixed qmake build errors.
This commit is contained in:
Sergey Yershov 2015-11-13 16:56:30 +03:00
commit 1833c78821
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
omim.pro
View file

@ -17,7 +17,6 @@ lessThan(QT_MAJOR_VERSION, 5) {
cache()
TEMPLATE = subdirs
CONFIG += ordered
HEADERS += defines.hpp
@ -116,11 +115,13 @@ SUBDIRS = 3party base coding geometry indexer routing
search_tests.depends = 3party base coding geometry platform indexer search
SUBDIRS *= search_tests
MapDepLibs = 3party base coding geometry platform storage indexer search map \
routing anim render gui graphics
search_integration_tests.subdir = search/search_integration_tests
search_integration_tests.depends = 3party base coding geometry platform indexer search
search_integration_tests.depends = $$MapDepLibs generator
SUBDIRS *= search_integration_tests
MapDepLibs = 3party base coding geometry platform storage indexer search map
map_tests.subdir = map/map_tests
map_tests.depends = $$MapDepLibs
SUBDIRS *= map_tests
@ -134,7 +135,7 @@ SUBDIRS = 3party base coding geometry indexer routing
SUBDIRS *= style_tests
routing_tests.subdir = routing/routing_tests
routing_tests.depends = $$MapDepLibs routing
routing_tests.depends = $$MapDepLibs
SUBDIRS *= routing_tests
routing_integration_tests.subdir = routing/routing_integration_tests

2
tools/autobuild/build.sh
View file

@ -52,7 +52,7 @@ BuildQt() {
cd "$SHADOW_DIR"
if [ ! -f "$SHADOW_DIR/Makefile" ]; then
echo "Launching qmake..."
"$QMAKE" CONFIG-=sdk -r "$QMAKE_PARAMS" -spec "$(StripCygwinPrefix $MKSPEC)" "$(StripCygwinPrefix $MY_PATH)/../../omim.pro"
"$QMAKE" CONFIG-=sdk "$QMAKE_PARAMS" -spec "$(StripCygwinPrefix $MKSPEC)" "$(StripCygwinPrefix $MY_PATH)/../../omim.pro"
fi
# make clean > /dev/null || true
make -j $(GetCPUCores)