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 /editor | |
| parent | 2ec8f5f71fee1f199a702c179eb5d29b1f5806ef (diff) | |
Added project declarations to subprojects
Replaced set with append
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | editor/editor_tests/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | editor/osm_auth_tests/CMakeLists.txt | 15 |
3 files changed, 14 insertions, 17 deletions
diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index 005477e6b8..b184f246d8 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -1,3 +1,5 @@ +project(editor) + set( SRC changeset_wrapper.cpp @@ -27,7 +29,7 @@ set( yes_no_unknown.hpp ) -add_library(editor ${SRC}) +add_library(${PROJECT_NAME} ${SRC}) omim_add_test_subdirectory(editor_tests) omim_add_test_subdirectory(osm_auth_tests) diff --git a/editor/editor_tests/CMakeLists.txt b/editor/editor_tests/CMakeLists.txt index 893266caea..457c0721a8 100644 --- a/editor/editor_tests/CMakeLists.txt +++ b/editor/editor_tests/CMakeLists.txt @@ -1,3 +1,5 @@ +project(editor_tests) + set( SRC config_loader_test.cpp @@ -10,10 +12,10 @@ set( xml_feature_test.cpp ) -omim_add_test(editor_tests ${SRC}) +omim_add_test(${PROJECT_NAME} ${SRC}) omim_link_libraries( - editor_tests + ${PROJECT_NAME} editor platform_tests_support platform @@ -25,16 +27,12 @@ omim_link_libraries( pugixml oauthcpp tomcrypt -) - -omim_link_libraries( - editor_tests ${Qt5Widgets_LIBRARIES} ) if (${PLATFORM_MAC}) omim_link_libraries( - editor_tests + ${PROJECT_NAME} "-framework Cocoa" "-framework IOKit" "-framework SystemConfiguration" diff --git a/editor/osm_auth_tests/CMakeLists.txt b/editor/osm_auth_tests/CMakeLists.txt index 3f2dc67a37..237337c86d 100644 --- a/editor/osm_auth_tests/CMakeLists.txt +++ b/editor/osm_auth_tests/CMakeLists.txt @@ -1,13 +1,15 @@ +project(osm_auth_tests) + set( SRC osm_auth_tests.cpp server_api_test.cpp ) -omim_add_test(osm_auth_tests ${SRC}) +omim_add_test(${PROJECT_NAME} ${SRC}) omim_link_libraries( - osm_auth_tests + ${PROJECT_NAME} editor platform platform_tests_support @@ -17,17 +19,12 @@ omim_link_libraries( pugixml oauthcpp tomcrypt -) - -target_link_libraries( - osm_auth_tests ${Qt5Widgets_LIBRARIES} ) if (${PLATFORM_MAC}) - target_link_libraries( - osm_auth_tests - ${Qt5Widgets_LIBRARIES} + omim_link_libraries( + ${PROJECT_NAME} "-framework Cocoa" "-framework IOKit" "-framework SystemConfiguration" |