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 /base | |
parent | 2ec8f5f71fee1f199a702c179eb5d29b1f5806ef (diff) |
Added project declarations to subprojects
Replaced set with append
Diffstat (limited to 'base')
-rw-r--r-- | base/CMakeLists.txt | 4 | ||||
-rw-r--r-- | base/base_tests/CMakeLists.txt | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 93e1e7a933..89acc66ef7 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -1,3 +1,5 @@ +project(base) + set( SRC SRC_FIRST.hpp @@ -77,6 +79,6 @@ set( internal/message.cpp ) -add_library(base ${SRC}) +add_library(${PROJECT_NAME} ${SRC}) omim_add_test_subdirectory(base_tests) diff --git a/base/base_tests/CMakeLists.txt b/base/base_tests/CMakeLists.txt index ffea7a6d6e..3120b52052 100644 --- a/base/base_tests/CMakeLists.txt +++ b/base/base_tests/CMakeLists.txt @@ -1,3 +1,5 @@ +project(base_tests) + add_definitions(-DOMIM_UNIT_TEST_DISABLE_PLATFORM_INIT) set( @@ -34,5 +36,5 @@ set( worker_thread_test.cpp ) -omim_add_test(base_tests ${SRC}) -omim_link_libraries(base_tests base) +omim_add_test(${PROJECT_NAME} ${SRC}) +omim_link_libraries(${PROJECT_NAME} base) |