diff options
| author | Timofey <t.danshin@corp.mail.ru> | 2016-09-12 17:45:15 +0300 |
|---|---|---|
| committer | Timofey <t.danshin@corp.mail.ru> | 2016-09-13 16:50:49 +0300 |
| commit | 22427594e5d0cc38b2f896d8616f36b618b644fb (patch) | |
| tree | 95e5f5766e06e498fb0c12a1b27d9e8d42e554cb /coding | |
| parent | 7ae88a7e7aa27c3e9b86799aebfcfbd06b0da132 (diff) | |
Now coding tests compile and pass.
Diffstat (limited to 'coding')
| -rw-r--r-- | coding/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | coding/coding_tests/CMakeLists.txt | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/coding/CMakeLists.txt b/coding/CMakeLists.txt index 4cdcf7a30f..52af1c6de7 100644 --- a/coding/CMakeLists.txt +++ b/coding/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(${PROJECT_SOURCE_DIR}/3party/tomcrypt/src/headers) +include_directories(${PROJECT_SOURCE_DIR}/3party/tomcrypt/src/headers ${PROJECT_SOURCE_DIR}/coding) set( SRC @@ -31,6 +31,10 @@ set( hex.hpp huffman.cpp huffman.hpp + internal/file64_api.hpp + internal/file_data.cpp + internal/file_data.hpp + internal/xmlparser.hpp matrix_traversal.hpp memory_region.hpp mmap_reader.cpp @@ -78,4 +82,4 @@ set( 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 5608fa86a3..9e454ebcf6 100644 --- a/coding/coding_tests/CMakeLists.txt +++ b/coding/coding_tests/CMakeLists.txt @@ -1,4 +1,4 @@ -#add_definitions(-DOMIM_UNIT_TEST_DISABLE_PLATFORM_INIT) +add_definitions(-DOMIM_UNIT_TEST_DISABLE_PLATFORM_INIT) set( SRC @@ -40,8 +40,8 @@ set( writer_test.cpp zip_creator_test.cpp zip_reader_test.cpp - ${PROJECT_SOURCE_DIR}/testing/testingmain.cpp ) omim_add_test(coding_tests ${SRC}) -omim_link_libraries(coding_test coding) + +omim_link_libraries(coding_tests coding base minizip tomcrypt succinct ${LIBZ}) |