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
path: root/coding
diff options
context:
space:
mode:
authorTimofey <t.danshin@corp.mail.ru>2016-09-06 15:36:35 +0300
committerTimofey <t.danshin@corp.mail.ru>2016-09-13 16:50:49 +0300
commit7ae88a7e7aa27c3e9b86799aebfcfbd06b0da132 (patch)
tree3586d85dda3a837c2a97e14670f1d64ed2c88076 /coding
parent5fcdf88b599c027d3ea8285994c384463c46b41f (diff)
Added editor
Diffstat (limited to 'coding')
-rw-r--r--coding/CMakeLists.txt52
-rw-r--r--coding/coding_tests/CMakeLists.txt16
2 files changed, 28 insertions, 40 deletions
diff --git a/coding/CMakeLists.txt b/coding/CMakeLists.txt
index 0ea5e28e91..4cdcf7a30f 100644
--- a/coding/CMakeLists.txt
+++ b/coding/CMakeLists.txt
@@ -1,13 +1,15 @@
include_directories(${PROJECT_SOURCE_DIR}/3party/tomcrypt/src/headers)
set(
- HEADERS
+ SRC
+ base64.cpp
base64.hpp
bit_streams.hpp
buffer_reader.hpp
byte_stream.hpp
coder.hpp
coder_util.hpp
+ compressed_bit_vector.cpp
compressed_bit_vector.hpp
constants.hpp
dd_vector.hpp
@@ -15,33 +17,48 @@ set(
diff_patch_common.hpp
elias_coder.hpp
endianness.hpp
+ file_container.cpp
file_container.hpp
+ file_name_utils.cpp
file_name_utils.hpp
+ file_reader.cpp
file_reader.hpp
file_sort.hpp
+ file_writer.cpp
file_writer.hpp
fixed_bits_ddvector.hpp
+ hex.cpp
hex.hpp
+ huffman.cpp
huffman.hpp
matrix_traversal.hpp
memory_region.hpp
+ mmap_reader.cpp
mmap_reader.hpp
+ multilang_utf8_string.cpp
multilang_utf8_string.hpp
parse_xml.hpp
+ png_memory_encoder.cpp
png_memory_encoder.hpp
polymorph_reader.hpp
read_write_utils.hpp
+ reader.cpp
reader.hpp
reader_cache.hpp
+ reader_streambuf.cpp
reader_streambuf.hpp
reader_wrapper.hpp
+ reader_writer_ops.cpp
reader_writer_ops.hpp
+ sha2.cpp
sha2.hpp
+ simple_dense_coding.cpp
simple_dense_coding.hpp
streams.hpp
streams_common.hpp
streams_sink.hpp
succinct_mapper.hpp
+ uri.cpp
uri.hpp
url_encode.hpp
value_opt_string.hpp
@@ -49,39 +66,16 @@ set(
var_serial_vector.hpp
varint.hpp
varint_misc.hpp
+# varint_vector.cpp
# 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_creator.hpp
zip_reader.cpp
+ zip_reader.hpp
)
-set(SRC ${HEADERS} ${SOURCES})
-
-omim_add_library(coding "${SRC}")
+omim_add_library(coding ${SRC})
-add_subdirectory(coding_tests)
+#add_subdirectory(coding_tests)
diff --git a/coding/coding_tests/CMakeLists.txt b/coding/coding_tests/CMakeLists.txt
index fd9387f3c8..5608fa86a3 100644
--- a/coding/coding_tests/CMakeLists.txt
+++ b/coding/coding_tests/CMakeLists.txt
@@ -1,17 +1,11 @@
#add_definitions(-DOMIM_UNIT_TEST_DISABLE_PLATFORM_INIT)
set(
- HEADERS
- coder_test.hpp
- reader_test.hpp
-)
-
-
-set(
- SOURCES
+ SRC
base64_for_user_id_test.cpp
base64_test.cpp
bit_streams_test.cpp
+ coder_test.hpp
coder_util_test.cpp
compressed_bit_vector_test.cpp
dd_vector_test.cpp
@@ -31,6 +25,7 @@ set(
png_decoder_test.cpp
reader_cache_test.cpp
reader_test.cpp
+ reader_test.hpp
reader_writer_ops_test.cpp
sha2_test.cpp
simple_dense_coding_test.cpp
@@ -48,6 +43,5 @@ set(
${PROJECT_SOURCE_DIR}/testing/testingmain.cpp
)
-set(SRC ${HEADERS} ${SOURCES})
-
-omim_add_test(coding_tests "${SRC}" coding)
+omim_add_test(coding_tests ${SRC})
+omim_link_libraries(coding_test coding)