diff options
| author | VladiMihaylenko <vxmihaylenko@gmail.com> | 2019-04-10 14:24:44 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <bykoianko@gmail.com> | 2019-06-10 13:50:13 +0300 |
| commit | 3c269a9093f3e7a64aae8a5b9247087694dda9e8 (patch) | |
| tree | b9734a7d4a33af18d92f9118d0597c49dc7ac7aa /CMakeLists.txt | |
| parent | ab613f081f7d6bcdc8f32871fb928c27bac6f6b5 (diff) | |
Submodule boost
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1eae3eb497..fcb45af6b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,23 +146,10 @@ if (PLATFORM_MAC) set(Boost_USE_STATIC_RUNTIME ON) endif() -find_package(Boost 1.64) - -if (NOT Boost_FOUND) - if (DEFINED ENV{BOOST_ROOT}) - if (DARWIN) - set(Boost_INCLUDE_DIR "$ENV{BOOST_ROOT}/include") - set(Boost_LIBRARY_DIR "$ENV{BOOST_ROOT}/lib") - else() - set(Boost_INCLUDE_DIR "$ENV{BOOST_ROOT}") - set(Boost_LIBRARY_DIR "$ENV{BOOST_ROOT}/libs") - endif() - else() - set(Boost_INCLUDE_DIR "${OMIM_ROOT}/3party/boost") - set(Boost_LIBRARY_DIR "${OMIM_ROOT}/3party/boost/libs") - endif() - find_package(Boost 1.64) -endif() +set(BOOST_VERSION 1.68) +set(Boost_INCLUDE_DIR "${OMIM_ROOT}/3party/boost") +set(Boost_LIBRARY_DIR "${OMIM_ROOT}/3party/boost/stage/lib/") +find_package(Boost ${BOOST_VERSION} EXACT) if (PYBINDINGS) add_subdirectory(pyhelpers) @@ -176,7 +163,7 @@ if (PYBINDINGS) set(BOOST_PYTHON_LIBNAME python) endif() endif() - find_package(Boost 1.64 REQUIRED COMPONENTS ${BOOST_PYTHON_LIBNAME}) + find_package(Boost ${BOOST_VERSION} EXACT REQUIRED COMPONENTS ${BOOST_PYTHON_LIBNAME}) find_package(PythonLibs ${PYTHON_VERSION} REQUIRED) include_directories(${PYTHON_INCLUDE_DIRS}) endif() |