diff --git a/coding/CMakeLists.txt b/coding/CMakeLists.txt
new file mode 100644
index 0000000000..0ea5e28e91
--- /dev/null
+++ b/coding/CMakeLists.txt
@@ -0,0 +1,87 @@
+include_directories(${PROJECT_SOURCE_DIR}/3party/tomcrypt/src/headers)
+
+set(
+    HEADERS
+    base64.hpp
+    bit_streams.hpp
+    buffer_reader.hpp
+    byte_stream.hpp
+    coder.hpp
+    coder_util.hpp
+    compressed_bit_vector.hpp
+    constants.hpp
+    dd_vector.hpp
+    diff.hpp
+    diff_patch_common.hpp
+    elias_coder.hpp
+    endianness.hpp
+    file_container.hpp
+    file_name_utils.hpp
+    file_reader.hpp
+    file_sort.hpp
+    file_writer.hpp
+    fixed_bits_ddvector.hpp
+    hex.hpp
+    huffman.hpp
+    matrix_traversal.hpp
+    memory_region.hpp
+    mmap_reader.hpp
+    multilang_utf8_string.hpp
+    parse_xml.hpp
+    png_memory_encoder.hpp
+    polymorph_reader.hpp
+    read_write_utils.hpp
+    reader.hpp
+    reader_cache.hpp
+    reader_streambuf.hpp
+    reader_wrapper.hpp
+    reader_writer_ops.hpp
+    sha2.hpp
+    simple_dense_coding.hpp
+    streams.hpp
+    streams_common.hpp
+    streams_sink.hpp
+    succinct_mapper.hpp
+    uri.hpp
+    url_encode.hpp
+    value_opt_string.hpp
+    var_record_reader.hpp
+    var_serial_vector.hpp
+    varint.hpp
+    varint_misc.hpp
+#    varint_vector.hpp
+    write_to_sink.hpp
+    writer.hpp
+    zip_creator.hpp
+    zip_reader.hpp
+)
+
+set(
+    SOURCES
+    base64.cpp
+    compressed_bit_vector.cpp
+    file_container.cpp
+    file_name_utils.cpp
+    file_reader.cpp
+    file_writer.cpp
+    hex.cpp
+    huffman.cpp
+    mmap_reader.cpp
+    multilang_utf8_string.cpp
+    png_memory_encoder.cpp
+    reader.cpp
+    reader_streambuf.cpp
+    reader_writer_ops.cpp
+    sha2.cpp
+    simple_dense_coding.cpp
+    uri.cpp
+#    varint_vector.cpp
+    zip_creator.cpp
+    zip_reader.cpp
+)
+
+set(SRC ${HEADERS} ${SOURCES})
+
+omim_add_library(coding "${SRC}")
+
+add_subdirectory(coding_tests)
diff --git a/coding/coding_tests/CMakeLists.txt b/coding/coding_tests/CMakeLists.txt
new file mode 100644
index 0000000000..fd9387f3c8
--- /dev/null
+++ b/coding/coding_tests/CMakeLists.txt
@@ -0,0 +1,53 @@
+#add_definitions(-DOMIM_UNIT_TEST_DISABLE_PLATFORM_INIT)
+
+set(
+    HEADERS
+    coder_test.hpp
+    reader_test.hpp
+)
+
+
+set(
+    SOURCES
+    base64_for_user_id_test.cpp
+    base64_test.cpp
+    bit_streams_test.cpp
+    coder_util_test.cpp
+    compressed_bit_vector_test.cpp
+    dd_vector_test.cpp
+    diff_test.cpp
+    elias_coder_test.cpp
+    endianness_test.cpp
+    file_container_test.cpp
+    file_data_test.cpp
+    file_sort_test.cpp
+    file_utils_test.cpp
+    fixed_bits_ddvector_test.cpp
+    hex_test.cpp
+    huffman_test.cpp
+    mem_file_reader_test.cpp
+    mem_file_writer_test.cpp
+    multilang_utf8_string_test.cpp
+    png_decoder_test.cpp
+    reader_cache_test.cpp
+    reader_test.cpp
+    reader_writer_ops_test.cpp
+    sha2_test.cpp
+    simple_dense_coding_test.cpp
+    succinct_mapper_test.cpp
+    uri_test.cpp
+    url_encode_test.cpp
+    value_opt_string_test.cpp
+    var_record_reader_test.cpp
+    var_serial_vector_test.cpp
+    varint_test.cpp
+    #varint_vector_test.cpp
+    writer_test.cpp
+    zip_creator_test.cpp
+    zip_reader_test.cpp
+    ${PROJECT_SOURCE_DIR}/testing/testingmain.cpp
+)
+
+set(SRC ${HEADERS} ${SOURCES})
+
+omim_add_test(coding_tests "${SRC}" coding)