map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Changed the path to the compiled libraries directory

Browse source 
Got rid of "production" and "simulator"
This commit is contained in:
Timofey 2016-11-28 20:08:21 +03:00
parent 7ff477ba4c
commit d36d371501
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -5687,7 +5687,7 @@
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(OMIM_ROOT)/../omim-iphone-cmake-production-$(CURRENT_ARCH)/out/production",
"$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release",
);
OTHER_LDFLAGS = (
"-lstats_client",
@ -5783,7 +5783,7 @@
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(OMIM_ROOT)/../omim-iphone-cmake-production-$(CURRENT_ARCH)/out/production",
"$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release",
);
OTHER_LDFLAGS = (
"-lstats_client",

23
tools/autobuild/ios_cmake.sh
View file

@ -10,9 +10,24 @@ if [[ $# < 1 ]]; then
fi
CONFIGURATION="$1"
source "$MY_PATH/build.sh"
source "$MY_PATH/detect_xcode.sh"
GetCPUCores() {
case "$OSTYPE" in
# it's GitBash under Windows
cygwin) echo $NUMBER_OF_PROCESSORS
;;
linux-gnu) grep -c ^processor /proc/cpuinfo 2>/dev/null
;;
darwin*) sysctl -n hw.ncpu
;;
*) echo "Unsupported platform in $0"
exit 1
;;
esac
return 0
}
BuildCmake() {
(
SHADOW_DIR="$1"
@ -22,7 +37,7 @@ BuildCmake() {
cd "$SHADOW_DIR"
pwd
echo "Launching cmake..."
CC=$CC CXX=$CXX cmake -r "$BUILD_TYPE" -DCMAKE_OSX_ARCHITECTURES=$ARCH -DNO_TESTS=TRUE -DPLATFORM=$PLATFORM "$(StripCygwinPrefix $MY_PATH)/../.."
CC=$CC CXX=$CXX cmake -r "$BUILD_TYPE" -DCMAKE_OSX_ARCHITECTURES=$ARCH -DNO_TESTS=TRUE -DPLATFORM=$PLATFORM "$MY_PATH/../.."
# make clean > /dev/null || true
make -j $(GetCPUCores) VERBOSE=1
)
@ -39,10 +54,10 @@ export SDK_ROOT
FINAL_PATH_COMPONENT="debug"
SHADOW_DIR="$MY_PATH/../../../omim-iphone-cmake"
if [[ $CONFIGURATION == *release* || $CONFIGURATION == *production* ]]; then
if [[ $CONFIGURATION == *release* ]]; then
BUILD_TYPE="Release"
FINAL_PATH_COMPONENT="release"
elif [[ $CONFIGURATION == *debug* || $CONFIGURATION == "simulator" ]]; then
elif [[ $CONFIGURATION == *debug* ]]; then
BUILD_TYPE="Debug"
FINAL_PATH_COMPONENT="debug"
else