diff options
| author | Timofey <t.danshin@corp.mail.ru> | 2016-11-17 17:40:33 +0300 |
|---|---|---|
| committer | Timofey <t.danshin@corp.mail.ru> | 2016-11-17 17:48:20 +0300 |
| commit | 7b32dfdc0b75b73892952592240b25da853bc412 (patch) | |
| tree | c441760486305b9702fd584a651156c7ee6ffb38 /traffic | |
| parent | 741681b3f3abc77c425fdbdb7ce59584089c6c84 (diff) | |
Fixed the cmake compilation
Diffstat (limited to 'traffic')
| -rw-r--r-- | traffic/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | traffic/pytraffic/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | traffic/traffic_tests/CMakeLists.txt | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/traffic/CMakeLists.txt b/traffic/CMakeLists.txt index c77f3f67ee..67e22055b3 100644 --- a/traffic/CMakeLists.txt +++ b/traffic/CMakeLists.txt @@ -11,4 +11,4 @@ set( add_library(${PROJECT_NAME} ${SRC}) add_subdirectory(pytraffic) -#add_subdirectory(traffic_tests) +add_subdirectory(traffic_tests) diff --git a/traffic/pytraffic/CMakeLists.txt b/traffic/pytraffic/CMakeLists.txt index 95aa28894d..148e08ec52 100644 --- a/traffic/pytraffic/CMakeLists.txt +++ b/traffic/pytraffic/CMakeLists.txt @@ -44,5 +44,14 @@ if (PLATFORM_WIN OR PLATFORM_LINUX) ) endif() -omim_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} traffic platform geometry base) +omim_link_libraries( + ${PROJECT_NAME} + ${PYTHON_LIBRARIES} + ${Boost_LIBRARIES} + traffic + platform + geometry + base +) + set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") diff --git a/traffic/traffic_tests/CMakeLists.txt b/traffic/traffic_tests/CMakeLists.txt index d148cf6e5d..d722122235 100644 --- a/traffic/traffic_tests/CMakeLists.txt +++ b/traffic/traffic_tests/CMakeLists.txt @@ -22,8 +22,8 @@ omim_link_libraries( geometry base stats_client - tomcrypt ${Qt5Core_LIBRARIES} + ${LIBZ} ) if (PLATFORM_MAC) |