Merge pull request #4741 from therearesomewhocallmetim/cmake_fix

Fixed the cmake compilation
2016-11-17 18:23:27 +03:00 · 2016-11-17 18:23:27 +03:00 · f42d8f123c
commit f42d8f123c
parent 2ab0c1073c 7b32dfdc0b
5 changed files with 12 additions and 5 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -158,7 +158,6 @@ add_subdirectory(editor)
 add_subdirectory(indexer)
 add_subdirectory(routing)
 add_subdirectory(search)
-add_subdirectory(traffic)
 add_subdirectory(tracking)
 add_subdirectory(traffic)
 add_subdirectory(partners_api)
--- a/partners_api/partners_api_tests/CMakeLists.txt
+++ b/partners_api/partners_api_tests/CMakeLists.txt
@ -16,7 +16,6 @@ omim_link_libraries(
  platform
  coding
  base
-  tomcrypt
  jansson
  stats_client
  ${LIBZ}
--- 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)
--- 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 "")
--- 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)