diff options
| author | Timofey <t.danshin@corp.mail.ru> | 2016-11-02 15:24:37 +0300 |
|---|---|---|
| committer | Timofey <t.danshin@corp.mail.ru> | 2016-11-02 19:09:29 +0300 |
| commit | 84772d00dbd265b64ae2e2fe184beb4ddc213434 (patch) | |
| tree | 373557ff67a19c115903562bd7d71cac1dcf14c5 /tracking | |
| parent | 497982b085197f4fe600565f0fbd49fc97a3e145 (diff) | |
Fixed compilation on Mac and Linux
Diffstat (limited to 'tracking')
| -rw-r--r-- | tracking/pytracking/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tracking/tracking_tests/CMakeLists.txt | 10 |
2 files changed, 15 insertions, 4 deletions
diff --git a/tracking/pytracking/CMakeLists.txt b/tracking/pytracking/CMakeLists.txt index 62f539906b..a26498469b 100644 --- a/tracking/pytracking/CMakeLists.txt +++ b/tracking/pytracking/CMakeLists.txt @@ -8,12 +8,15 @@ add_compile_options( "-Wno-unused-local-typedef" ) -set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_MULTITHREADED ON) -set(Boost_USE_STATIC_RUNTIME ON) + +if (PLATFORM_MAC) + set(Boost_USE_STATIC_LIBS ON) + set(Boost_USE_STATIC_RUNTIME ON) +endif() find_package(PythonLibs 2.7 REQUIRED) -find_package(Boost 1.60 REQUIRED COMPONENTS python) +find_package(Boost 1.54 REQUIRED COMPONENTS python) include_directories(${PYTHON_INCLUDE_DIRS}) add_library(${PROJECT_NAME} MODULE ${SRC}) diff --git a/tracking/tracking_tests/CMakeLists.txt b/tracking/tracking_tests/CMakeLists.txt index 9bdb8862d6..377c3a7dbb 100644 --- a/tracking/tracking_tests/CMakeLists.txt +++ b/tracking/tracking_tests/CMakeLists.txt @@ -5,4 +5,12 @@ set( ) omim_add_test(tracking_tests ${SRC}) -omim_link_libraries(tracking_tests tracking) +omim_link_libraries(tracking_tests tracking platform platform_tests_support coding base geometry tomcrypt ${Qt5Widgets_LIBRARIES}) + +if (${PLATFORM_MAC}) + target_link_libraries(tracking_tests + "-framework Cocoa" + "-framework IOKit" + "-framework SystemConfiguration" + ) +endif() |