diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000000..309b72b4d6
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,56 @@
+cmake_minimum_required(VERSION 3.2)
+
+project(omim C CXX)
+
+add_compile_options(
+    "-Wall"
+    "-pedantic"
+    "-std=c++11"
+)
+
+find_package(Threads)
+
+get_filename_component(PROJECT_SOURCE_DIR . ABSOLUTE)
+
+include_directories(${CMAKE_HOME_DIRECTORY})
+
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+
+if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+    add_definitions(-DDEBUG)
+endif()
+
+if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
+    set(CMAKE_BUILD_TYPE "Release")
+endif()
+
+if ("${NO_TESTS}" STREQUAL "")
+    set(NO_TESTS FALSE)
+endif()
+
+function(omim_add_library library)
+    add_library(${library} ${ARGN})
+endfunction()
+
+function(omim_add_executable executable)
+    add_executable(${executable} ${ARGN})
+endfunction()
+
+function(omim_add_test executable)
+    if (NOT ${NO_TESTS})
+        omim_add_executable(${executable} ${PROJECT_SOURCE_DIR}/testing/testingmain.cpp ${ARGN})
+    endif()
+endfunction()
+
+function(omim_link_libraries target)
+    if (TARGET ${target})
+        target_link_libraries(${target} ${ARGN} ${CMAKE_THREAD_LIBS_INIT})
+    else()
+        message("~> Skipping linking the libraries to the target ${target} as it does not exist")
+    endif()
+endfunction()
+
+
+add_subdirectory(base)
+add_subdirectory(geometry)
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
new file mode 100644
index 0000000000..cf59f0932c
--- /dev/null
+++ b/base/CMakeLists.txt
@@ -0,0 +1,82 @@
+add_subdirectory(base_tests)
+
+set(
+    SRC
+    SRC_FIRST.hpp
+    array_adapters.hpp
+    assert.hpp
+    base.cpp
+    base.hpp
+    bits.hpp
+    buffer_vector.hpp
+    cache.hpp
+    cancellable.hpp
+    collection_cast.hpp
+    condition.cpp
+    condition.hpp
+    condition_bada.cpp
+    condition_posix.cpp
+    condition_windows_native.cpp
+    const_helper.hpp
+    deferred_task.cpp
+    deferred_task.hpp
+    exception.cpp
+    exception.hpp
+    gmtime.cpp
+    gmtime.hpp
+    limited_priority_queue.hpp
+    logging.cpp
+    logging.hpp
+    lower_case.cpp
+    macros.hpp
+    math.hpp
+    matrix.hpp
+    mem_trie.hpp
+    mutex.hpp
+    newtype.hpp
+    normalize_unicode.cpp
+    object_tracker.cpp
+    object_tracker.hpp
+    observer_list.hpp
+    range_iterator.hpp
+    ref_counted.hpp
+    rolling_hash.hpp
+    scope_guard.hpp
+    set_operations.hpp
+    shared_buffer_manager.cpp
+    shared_buffer_manager.hpp
+    src_point.cpp
+    src_point.hpp
+    stats.hpp
+    std_serialization.hpp
+    stl_add.hpp
+    stl_helpers.hpp
+    stl_iterator.hpp
+    string_format.cpp
+    string_format.hpp
+    string_utils.cpp
+    string_utils.hpp
+    strings_bundle.cpp
+    strings_bundle.hpp
+    sunrise_sunset.cpp
+    sunrise_sunset.hpp
+    swap.hpp
+    thread.cpp
+    thread.hpp
+    thread_checker.cpp
+    thread_checker.hpp
+    thread_pool.cpp
+    thread_pool.hpp
+    threaded_container.cpp
+    threaded_container.hpp
+    threaded_list.hpp
+    threaded_priority_queue.hpp
+    timegm.cpp
+    timegm.hpp
+    timer.cpp
+    timer.hpp
+    worker_thread.hpp
+    internal/message.cpp
+)
+
+omim_add_library(base ${SRC})
diff --git a/base/base_tests/CMakeLists.txt b/base/base_tests/CMakeLists.txt
new file mode 100644
index 0000000000..4a51f647b2
--- /dev/null
+++ b/base/base_tests/CMakeLists.txt
@@ -0,0 +1,38 @@
+add_definitions(-DOMIM_UNIT_TEST_DISABLE_PLATFORM_INIT)
+
+set(
+    SRC
+    assert_test.cpp
+    bits_test.cpp
+    buffer_vector_test.cpp
+    cache_test.cpp
+    collection_cast_test.cpp
+    condition_test.cpp
+    const_helper.cpp
+    containers_test.cpp
+    logging_test.cpp
+    math_test.cpp
+    matrix_test.cpp
+    mem_trie_test.cpp
+    newtype_test.cpp
+    observer_list_test.cpp
+    range_iterator_test.cpp
+    ref_counted_tests.cpp
+    regexp_test.cpp
+    rolling_hash_test.cpp
+    scope_guard_test.cpp
+    stl_add_test.cpp
+    stl_helpers_test.cpp
+    string_format_test.cpp
+    string_utils_test.cpp
+    sunrise_sunset_test.cpp
+    thread_pool_tests.cpp
+    threaded_list_test.cpp
+    threads_test.cpp
+    timegm_test.cpp
+    timer_test.cpp
+    worker_thread_test.cpp
+)
+
+omim_add_test(base_tests ${SRC})
+omim_link_libraries(base_tests base)
diff --git a/geometry/CMakeLists.txt b/geometry/CMakeLists.txt
new file mode 100644
index 0000000000..0cdcb8927a
--- /dev/null
+++ b/geometry/CMakeLists.txt
@@ -0,0 +1,51 @@
+add_subdirectory(geometry_tests)
+
+set(
+    SRC
+    algorithm.cpp
+    algorithm.hpp
+    angles.cpp
+    angles.hpp
+    any_rect2d.hpp
+    avg_vector.hpp
+    cellid.hpp
+    clipping.cpp
+    clipping.hpp
+    covering.hpp
+    covering_utils.hpp
+    distance.hpp
+    distance_on_sphere.cpp
+    distance_on_sphere.hpp
+    latlon.cpp
+    latlon.hpp
+    mercator.cpp
+    mercator.hpp
+    packer.cpp
+    packer.hpp
+    point2d.hpp
+    pointu_to_uint64.hpp
+    polygon.hpp
+    polyline2d.hpp
+    rect2d.hpp
+    rect_intersect.hpp
+    region2d.hpp
+    robust_orientation.cpp
+    robust_orientation.hpp
+    screenbase.cpp
+    screenbase.hpp
+    segment2d.cpp
+    segment2d.hpp
+    simplification.hpp
+    spline.cpp
+    spline.hpp
+    transformations.hpp
+    tree4d.hpp
+    triangle2d.cpp
+    triangle2d.hpp
+
+    region2d/binary_operators.cpp
+    region2d/binary_operators.hpp
+    region2d/boost_concept.hpp
+)
+
+omim_add_library(geometry ${SRC})
diff --git a/geometry/geometry_tests/CMakeLists.txt b/geometry/geometry_tests/CMakeLists.txt
new file mode 100644
index 0000000000..0c560297f1
--- /dev/null
+++ b/geometry/geometry_tests/CMakeLists.txt
@@ -0,0 +1,38 @@
+add_definitions(-DOMIM_UNIT_TEST_DISABLE_PLATFORM_INIT)
+
+set(
+    SRC
+    algorithm_test.cpp
+    angle_test.cpp
+    anyrect_test.cpp
+    cellid_test.cpp
+    clipping_test.cpp
+    common_test.cpp
+    covering_test.cpp
+    distance_on_sphere_test.cpp
+    distance_test.cpp
+    equality.hpp
+    intersect_test.cpp
+    large_polygon.hpp
+    latlon_test.cpp
+    mercator_test.cpp
+    packer_test.cpp
+    point_test.cpp
+    pointu_to_uint64_test.cpp
+    polygon_test.cpp
+    rect_test.cpp
+    region2d_binary_op_test.cpp
+    region_test.cpp
+    robust_test.cpp
+    screen_test.cpp
+    segments_intersect_test.cpp
+    simplification_test.cpp
+    spline_test.cpp
+    test_regions.hpp
+    transformations_test.cpp
+    tree_test.cpp
+    vector_test.cpp
+)
+
+omim_add_test(geometry_tests ${SRC})
+omim_link_libraries(geometry_tests base geometry)