Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 685718 | Differences between
and this patch

Collapse All | Expand All

(-)a/CMakeLists.txt (-3 / +15 lines)
Lines 210-219 find_package(Boost ${MINIMUM_BOOST_VERSION} Link Here
210
        thread
210
        thread
211
    REQUIRED)
211
    REQUIRED)
212
if(${Boost_VERSION} GREATER 106699) # boost >= 1.67
212
if(${Boost_VERSION} GREATER 106699) # boost >= 1.67
213
    find_package(Boost COMPONENTS python27 REQUIRED)
213
    find_package(Boost COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} REQUIRED)
214
    set(Boost_PYTHON_LIBRARY ${Boost_PYTHON27_LIBRARY})
214
    set(Boost_PYTHON_LIBRARY ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY})
215
else()
215
else()
216
    find_package(Boost COMPONENTS python REQUIRED)
216
    # boost python suffixes are determined by distributives
217
    # try different alternatives
218
    find_package(Boost OPTIONAL_COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
219
    if(Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
220
        set(Boost_PYTHON_LIBRARY ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY})
221
    else()
222
        find_package(Boost OPTIONAL_COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
223
        if(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
224
            set(Boost_PYTHON_LIBRARY ${Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY})
225
        else()
226
            find_package(Boost COMPONENTS python REQUIRED)
227
        endif()
228
    endif()
217
endif()
229
endif()
218
230
219
find_package(ZLIB REQUIRED)
231
find_package(ZLIB REQUIRED)

Return to bug 685718