]>
Commit | Line | Data |
---|---|---|
0beb5c2c JR |
1 | --- avogadro-1.2.0/cmake/modules/PythonDeps.cmake~ 2016-06-08 16:19:45.000000000 +0200 |
2 | +++ avogadro-1.2.0/cmake/modules/PythonDeps.cmake 2019-04-21 10:19:54.127042217 +0200 | |
3 | @@ -2,7 +2,7 @@ | |
4 | # This CMake file defines | |
5 | # ALL_PYTHON_FOUND, if false, do not try to use python. | |
6 | ||
7 | -if(Boost_PYTHON_FOUND AND PYTHONLIBS_FOUND AND NUMPY_FOUND) | |
8 | +if(Boost_PYTHON27_FOUND AND PYTHONLIBS_FOUND AND NUMPY_FOUND) | |
9 | # In cache already | |
10 | set(ALL_PYTHON_FOUND TRUE) | |
11 | ||
12 | @@ -14,8 +14,8 @@ | |
13 | # CMake's new FindBoost has an option to look for additional versions | |
14 | set(Boost_ADDITIONAL_VERSIONS "1.45" "1.44" "1.43" "1.42" "1.41" "1.40" | |
15 | "1.40.0" "1.39" "1.39.0" "1.38" "1.38.0" "1.37" "1.37.0") | |
16 | - find_package(Boost COMPONENTS python) | |
17 | - if (Boost_PYTHON_FOUND) | |
18 | + find_package(Boost COMPONENTS python27) | |
19 | + if (Boost_PYTHON27_FOUND) | |
20 | message(STATUS "Boost Python found...") | |
21 | else() | |
22 | message(STATUS "Boost Python NOT found - Python support disabled.") |