Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Grechuhin <i.grechuhin@gmail.com>2017-09-21 14:15:57 +0300
committerVladimir Byko-Ianko <bykoianko@gmail.com>2017-09-27 19:04:41 +0300
commite9785a011c3f0c96f7b249a5b1e09c401bed6e79 (patch)
treea7a2baa438335155e7785f0003ed1e5cdb159425
parentc2348ae5912cc28c55794f43cf3eef4e849b742d (diff)
[xcode-9] [ios] Fixed cmake build.
-rw-r--r--CMakeLists.txt1
-rw-r--r--generator/CMakeLists.txt2
-rw-r--r--iphone/Maps/Maps.xcodeproj/project.pbxproj12
-rwxr-xr-xiphone/Maps/run-script-for-cmake.sh2
4 files changed, 14 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5dcdd96f64..e2053bd182 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -313,6 +313,7 @@ add_subdirectory(3party/gflags)
add_subdirectory(3party/bsdiff-courgette)
add_subdirectory(base)
add_subdirectory(coding)
+add_subdirectory(generator/mwm_diff)
add_subdirectory(geometry)
add_subdirectory(platform)
add_subdirectory(3party/opening_hours)
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index bc27d79212..5815608c6b 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -110,8 +110,6 @@ add_library(${PROJECT_NAME} ${SRC})
omim_add_test_subdirectory(generator_tests_support)
omim_add_test_subdirectory(generator_tests)
-add_subdirectory(mwm_diff)
-
if (NOT SKIP_GTOOL)
add_subdirectory(generator_tool)
endif()
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 0b2d936470..f28b01f9df 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -6783,6 +6783,8 @@
"-llocal_ads",
"-lbsdiff",
"-lmwm_diff",
+ "-lugc",
+ "-lagg",
);
PRODUCT_NAME = "cm dbg";
};
@@ -6835,6 +6837,8 @@
"-llocal_ads",
"-lbsdiff",
"-lmwm_diff",
+ "-lugc",
+ "-lagg",
);
PRODUCT_NAME = "cm rel";
};
@@ -6887,6 +6891,8 @@
"-llocal_ads",
"-lbsdiff",
"-lmwm_diff",
+ "-lugc",
+ "-lagg",
);
PRODUCT_NAME = "cm dbg";
};
@@ -6939,6 +6945,8 @@
"-llocal_ads",
"-lbsdiff",
"-lmwm_diff",
+ "-lugc",
+ "-lagg",
);
PRODUCT_NAME = "cm beta";
};
@@ -6991,6 +6999,8 @@
"-llocal_ads",
"-lbsdiff",
"-lmwm_diff",
+ "-lugc",
+ "-lagg",
);
PRODUCT_NAME = "cm rel";
};
@@ -7043,6 +7053,8 @@
"-llocal_ads",
"-lbsdiff",
"-lmwm_diff",
+ "-lugc",
+ "-lagg",
);
PRODUCT_NAME = "cm pf";
};
diff --git a/iphone/Maps/run-script-for-cmake.sh b/iphone/Maps/run-script-for-cmake.sh
index 81bd37e2ef..dd87dcc18e 100755
--- a/iphone/Maps/run-script-for-cmake.sh
+++ b/iphone/Maps/run-script-for-cmake.sh
@@ -11,7 +11,7 @@ fi
# Respect "Build for active arch only" project setting.
if [[ "$ONLY_ACTIVE_ARCH" == YES ]]; then
if [[ ! -z $CURRENT_ARCH ]]; then
- VALID_ARCHS="$CURRENT_ARCH"
+ VALID_ARCHS=${ARCHS[0]}
fi
fi