diff options
| author | Maksim Andrianov <maksimandrianov1@gmail.com> | 2019-05-14 18:55:45 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <bykoianko@gmail.com> | 2019-06-10 13:50:13 +0300 |
| commit | b65220e0df698ac46ba59f1ef8313f90c8e2a073 (patch) | |
| tree | dac435e310fee61c36e8c2171442e2e3d49cfcc4 /CMakeLists.txt | |
| parent | c63e2a5077bff329b63f5954737ecfea0e8fbc50 (diff) | |
Review fixes.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a065c23c5b..c5314a3f0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,24 +138,15 @@ endif() # Find installed packages -find_package(Threads) - -set(Boost_USE_MULTITHREADED ON) - -if (PLATFORM_MAC) - set(Boost_USE_STATIC_LIBS ON) - set(Boost_USE_STATIC_RUNTIME ON) -endif() set(BOOST_VERSION 1.68) -set(BOOST_ROOT "${OMIM_ROOT}/3party/boost") -set(BOOST_INCLUDEDIR "${OMIM_ROOT}/3party/boost") -set(BOOST_BOOST_LIBRARYDIR "${OMIM_ROOT}/3party/boost/stage/lib/") -set(Boost_NO_SYSTEM_PATHS ON) - -set(Boost_INCLUDE_DIR "${BOOST_INCLUDEDIR}") -set(Boost_LIBRARY_DIR "${BOOST_BOOST_LIBRARYDIR}") +set(OMIM_BOOST_SRC "${OMIM_ROOT}/3party/boost") +set(OMIM_BOOST_BINARY_PATH "${CMAKE_BINARY_DIR}/3party/boost/") +set(Boost_INCLUDE_DIR "${OMIM_BOOST_SRC}") +set(Boost_LIBRARY_DIR "${OMIM_BOOST_BINARY_PATH}/lib") set(Boost_USE_STATIC_LIBS ON) +find_package(Threads) +set(Boost_USE_MULTITHREADED ON) init_boost() install_boost_headers() |