From e60195777f09cf787c2ca4d6b1172fcd37749fc0 Mon Sep 17 00:00:00 2001
From: Timofey <t.danshin@corp.mail.ru>
Date: Fri, 13 Jan 2017 14:28:11 +0300
Subject: [PATCH 1/2] Enable building the generator tool with cmake.

---
 generator/CMakeLists.txt                |  4 +++
 generator/generator_tool/CMakeLists.txt | 39 +++++++++++++++++++++++++
 tools/autobuild/ios_cmake.sh            |  2 +-
 tools/unix/build_omim.sh                | 13 +++++++--
 4 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 generator/generator_tool/CMakeLists.txt

diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index 2dc8add5cc..3b285bf783 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -92,3 +92,7 @@ add_library(${PROJECT_NAME} ${SRC})
 
 omim_add_test_subdirectory(generator_tests_support)
 omim_add_test_subdirectory(generator_tests)
+
+if (NOT SKIP_GTOOL)
+  add_subdirectory(generator_tool)
+endif()
diff --git a/generator/generator_tool/CMakeLists.txt b/generator/generator_tool/CMakeLists.txt
new file mode 100644
index 0000000000..1b9e09ea95
--- /dev/null
+++ b/generator/generator_tool/CMakeLists.txt
@@ -0,0 +1,39 @@
+project(generator_tool)
+
+include_directories(${OMIM_PATH}/3party/gflags/src)
+
+set(SRC generator_tool.cpp)
+
+add_executable(${PROJECT_NAME} ${SRC})
+
+omim_link_libraries(
+  ${PROJECT_NAME}
+  generator
+  routing
+  traffic
+  search
+  storage
+  indexer
+  editor
+  platform
+  geometry
+  coding
+  base
+  opening_hours
+  freetype
+  expat
+  fribidi
+  jansson
+  protobuf
+  osrm
+  stats_client
+  minizip
+  succinct
+  pugixml
+  tess2
+  gflags
+  oauthcpp
+  ${LIBZ}
+)
+
+link_qt5_core(${PROJECT_NAME})
diff --git a/tools/autobuild/ios_cmake.sh b/tools/autobuild/ios_cmake.sh
index dbd683a66d..8e2901a86c 100755
--- a/tools/autobuild/ios_cmake.sh
+++ b/tools/autobuild/ios_cmake.sh
@@ -37,7 +37,7 @@ BuildCmake() {
     cd "$SHADOW_DIR"
     pwd
     echo "Launching cmake..."
-    CC=$CC CXX=$CXX cmake -r "$BUILD_TYPE" -DCMAKE_OSX_ARCHITECTURES=$ARCH -DSKIP_TESTS=TRUE -DSKIP_DESKTOP=TRUE -DPLATFORM=$PLATFORM "$MY_PATH/../.."
+    CC=$CC CXX=$CXX cmake -r "$BUILD_TYPE" -DCMAKE_OSX_ARCHITECTURES=$ARCH -DSKIP_TESTS=TRUE -DSKIP_DESKTOP=TRUE -DSKIP_GTOOL=TRUE -DPLATFORM=$PLATFORM "$MY_PATH/../.."
 #    make clean > /dev/null || true
     make -j $(GetCPUCores) VERBOSE=1
   )
diff --git a/tools/unix/build_omim.sh b/tools/unix/build_omim.sh
index 65178a8f92..1a78cc7854 100755
--- a/tools/unix/build_omim.sh
+++ b/tools/unix/build_omim.sh
@@ -112,8 +112,17 @@ build_conf_osrm()
   (
     export BOOST_INCLUDEDIR="$BOOST_PATH/include"
     cd "$DIRNAME"
-    "$QMAKE" "$OMIM_PATH/omim.pro" ${SPEC:+-spec $SPEC} "CONFIG+=$CONF osrm" ${CONFIG+"CONFIG*=$CONFIG"}
-    make -j $PROCESSES
+
+    if [[ -z ${CMAKE_OMIM+x} ]]; then
+      DIRNAME="$DIRNAME/out/$CONF"
+      mkdir -p "$DIRNAME"
+      cd $DIRNAME
+      cmake $OMIM_PATH
+      make routing indexer geometry coding base jansson -j $PROCESSES
+    else
+      "$QMAKE" "$OMIM_PATH/omim.pro" ${SPEC:+-spec $SPEC} "CONFIG+=$CONF osrm" ${CONFIG+"CONFIG*=$CONFIG"}
+      make -j $PROCESSES
+    fi
   )
 }
 

From bef7eb393357f6fa41fb3f130dea0850e89d07bb Mon Sep 17 00:00:00 2001
From: Timofey <t.danshin@corp.mail.ru>
Date: Fri, 20 Jan 2017 18:35:02 +0300
Subject: [PATCH 2/2] PR fixes

---
 tools/unix/build_omim.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/unix/build_omim.sh b/tools/unix/build_omim.sh
index 1a78cc7854..6ce0640d8b 100755
--- a/tools/unix/build_omim.sh
+++ b/tools/unix/build_omim.sh
@@ -116,11 +116,11 @@ build_conf_osrm()
     if [[ -z ${CMAKE_OMIM+x} ]]; then
       DIRNAME="$DIRNAME/out/$CONF"
       mkdir -p "$DIRNAME"
-      cd $DIRNAME
-      cmake $OMIM_PATH
+      cd "$DIRNAME"
+      cmake "$OMIM_PATH"
       make routing indexer geometry coding base jansson -j $PROCESSES
     else
-      "$QMAKE" "$OMIM_PATH/omim.pro" ${SPEC:+-spec $SPEC} "CONFIG+=$CONF osrm" ${CONFIG+"CONFIG*=$CONFIG"}
+      "$QMAKE" "$OMIM_PATH/omim.pro" ${SPEC:+-spec $SPEC} "CONFIG+=$CONF osrm no-tests" ${CONFIG+"CONFIG*=$CONFIG"}
       make -j $PROCESSES
     fi
   )