diff options
| author | Грешилов Вячеслав <v.greshilov@corp.mail.ru> | 2017-11-01 10:34:41 +0300 |
|---|---|---|
| committer | Yuri Gorshenin <mipt.vi002@gmail.com> | 2017-11-01 12:52:35 +0300 |
| commit | 2b9885f2c931b89f30b45e873aa1629bccae90f9 (patch) | |
| tree | 2b95fd97e41e8fd17164015be8a0c156d237d042 /CMakeLists.txt | |
| parent | c3ffcde70fd6b701c80d6decbefe681613a97bd3 (diff) | |
mend
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b3f0946aa..9b0179edb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,6 +45,8 @@ if (ANDROID_DETECTED AND (${OS} MATCHES "mac")) set(DARWIN TRUE) endif() +message(${OS}) + omim_set_platform_var(PLATFORM_IPHONE "iphone-.*") omim_set_platform_var(PLATFORM_ANDROID "android-.*" ${ANDROID_DETECTED}) omim_set_platform_var(PLATFORM_MAC "macx-.*" ${APPLE}) @@ -119,6 +121,8 @@ endif() # Find installed packages +get_filename_component(OMIM_ROOT . ABSOLUTE) + find_package(Threads) set(Boost_USE_MULTITHREADED ON) @@ -140,10 +144,11 @@ if (NOT Boost_FOUND) set(Boost_LIBRARY_DIR "$ENV{BOOST_ROOT}/libs") endif() find_package(Boost 1.54) - else() - message("Please set BOOST_ROOT environment variable (path to Boost dirs 'include, lib')") - message("Note that for Android Boost version must be less than 1.6.*") endif() +else() + set(Boost_INCLUDE_DIR "${OMIM_ROOT}/3party/boost") + set(Boost_LIBRARY_DIR "${OMIM_ROOT}/3party/boost/libs") + find_package(Boost 1.54) endif() if (PYBINDINGS) @@ -196,8 +201,6 @@ else() include_directories(${DEVELOPER_FRAMEWORKS_DIR}) endif() -get_filename_component(OMIM_ROOT . ABSOLUTE) - include_directories( ${CMAKE_HOME_DIRECTORY} ${Qt5Core_INCLUDE_DIRS} |