diff options
| author | Timofey <t.danshin@corp.mail.ru> | 2016-11-03 18:34:24 +0300 |
|---|---|---|
| committer | Timofey <t.danshin@corp.mail.ru> | 2016-11-09 14:20:06 +0300 |
| commit | 14a9cea834027fcd1c0131b13f61c0f42f6439b9 (patch) | |
| tree | a13d3ed28ccbe37e58c21119e7348e8c5ee72707 /coding | |
| parent | 2ec8f5f71fee1f199a702c179eb5d29b1f5806ef (diff) | |
Added project declarations to subprojects
Replaced set with append
Diffstat (limited to 'coding')
| -rw-r--r-- | coding/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | coding/coding_tests/CMakeLists.txt | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/coding/CMakeLists.txt b/coding/CMakeLists.txt index ab8966f134..5a912d765d 100644 --- a/coding/CMakeLists.txt +++ b/coding/CMakeLists.txt @@ -1,3 +1,5 @@ +project(coding) + include_directories(${OMIM_ROOT}/3party/tomcrypt/src/headers ${OMIM_ROOT}/coding) set( @@ -82,6 +84,6 @@ set( zip_reader.hpp ) -add_library(coding ${SRC}) +add_library(${PROJECT_NAME} ${SRC}) omim_add_test_subdirectory(coding_tests) diff --git a/coding/coding_tests/CMakeLists.txt b/coding/coding_tests/CMakeLists.txt index b01c25f140..236728c9da 100644 --- a/coding/coding_tests/CMakeLists.txt +++ b/coding/coding_tests/CMakeLists.txt @@ -1,3 +1,5 @@ +project(coding_tests) + add_definitions(-DOMIM_UNIT_TEST_DISABLE_PLATFORM_INIT) set( @@ -43,6 +45,6 @@ set( zip_reader_test.cpp ) -omim_add_test(coding_tests ${SRC}) +omim_add_test(${PROJECT_NAME} ${SRC}) -omim_link_libraries(coding_tests coding base geometry minizip tomcrypt succinct ${LIBZ}) +omim_link_libraries(${PROJECT_NAME} coding base geometry minizip tomcrypt succinct ${LIBZ}) |