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 /geometry | |
| parent | 2ec8f5f71fee1f199a702c179eb5d29b1f5806ef (diff) | |
Added project declarations to subprojects
Replaced set with append
Diffstat (limited to 'geometry')
| -rw-r--r-- | geometry/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | geometry/geometry_tests/CMakeLists.txt | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/geometry/CMakeLists.txt b/geometry/CMakeLists.txt index 30b0132ce1..8eae14a978 100644 --- a/geometry/CMakeLists.txt +++ b/geometry/CMakeLists.txt @@ -1,3 +1,5 @@ +project(geometry) + set( SRC algorithm.cpp @@ -46,6 +48,6 @@ set( region2d/boost_concept.hpp ) -add_library(geometry ${SRC}) +add_library(${PROJECT_NAME} ${SRC}) add_subdirectory(geometry_tests) diff --git a/geometry/geometry_tests/CMakeLists.txt b/geometry/geometry_tests/CMakeLists.txt index d87a02cd47..5296671269 100644 --- a/geometry/geometry_tests/CMakeLists.txt +++ b/geometry/geometry_tests/CMakeLists.txt @@ -1,3 +1,5 @@ +project(geometry_tests) + add_definitions(-DOMIM_UNIT_TEST_DISABLE_PLATFORM_INIT) set( @@ -34,5 +36,5 @@ set( vector_test.cpp ) -omim_add_test(geometry_tests ${SRC}) -omim_link_libraries(geometry_tests geometry base) +omim_add_test(${PROJECT_NAME} ${SRC}) +omim_link_libraries(${PROJECT_NAME} geometry base) |