Skip to content

Commit e0fba3f

Browse files
thelferthelfer
committed
Fix Issue #983 
1 parent f016ba1 commit e0fba3f

1 file changed

Lines changed: 40 additions & 40 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -356,85 +356,85 @@ if(enable-python-bindings)
356356
if(NOT HAVE_PYTHON)
357357
message(FATAL_ERROR "python not found. python is mandatory for python bindings.")
358358
endif(NOT HAVE_PYTHON)
359-
message(STATUS "Trying to find libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
359+
message(STATUS "Trying to find libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
360360
# Fix a bug in FindBoost 1.70
361361
# https://github.com/boostorg/boost_install/issues/5
362362
if(NOT DEFINED BUILD_SHARED_LIBS)
363363
set(TFEL_TMP_BUILD_SHARED_LIBS ON)
364364
set(BUILD_SHARED_LIBS ON)
365365
endif(NOT DEFINED BUILD_SHARED_LIBS)
366366
find_package(Boost 1.36.0 COMPONENTS
367-
"python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
368-
if(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
367+
"python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
368+
if(Boost_PYTHON-PY${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_FOUND)
369369
set(Boost_PYTHON_FOUND ON)
370-
set(Boost_PYTHON_LIBRARY "${Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY}")
370+
set(Boost_PYTHON_LIBRARY "${Boost_PYTHON-PY${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_LIBRARY}")
371371
if(enable-numpy-support)
372372
find_package(Boost 1.36.0 COMPONENTS
373-
"numpy-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
374-
if(Boost_NUMPY-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
373+
"numpy-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
374+
if(Boost_NUMPY-PY${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_FOUND)
375375
set(Boost_NUMPY_FOUND ON)
376-
set(Boost_NUMPY_LIBRARY "${Boost_NUMPY-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY}")
377-
endif(Boost_NUMPY-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
376+
set(Boost_NUMPY_LIBRARY "${Boost_NUMPY-PY${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_LIBRARY}")
377+
endif(Boost_NUMPY-PY${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_FOUND)
378378
endif(enable-numpy-support)
379-
else(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
379+
else(Boost_PYTHON-PY${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_FOUND)
380380
set(Boost_PYTHON_FOUND OFF)
381-
endif(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
381+
endif(Boost_PYTHON-PY${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_FOUND)
382382
if(NOT Boost_PYTHON_FOUND)
383-
message(STATUS "Trying to find libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
383+
message(STATUS "Trying to find libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
384384
find_package(Boost 1.36.0 COMPONENTS
385-
"python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
386-
if(Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
385+
"python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
386+
if(Boost_PYTHON${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_FOUND)
387387
set(Boost_PYTHON_FOUND ON)
388-
set(Boost_PYTHON_LIBRARY "${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY}")
388+
set(Boost_PYTHON_LIBRARY "${Boost_PYTHON${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_LIBRARY}")
389389
if(enable-numpy-support)
390390
find_package(Boost 1.36.0 COMPONENTS
391-
"numpy${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
392-
if(Boost_NUMPY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
391+
"numpy${Python_VERSION_MAJOR}${Python_VERSION_MINOR}")
392+
if(Boost_NUMPY${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_FOUND)
393393
set(Boost_NUMPY_FOUND ON)
394-
set(Boost_NUMPY_LIBRARY "${Boost_NUMPY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY}")
395-
endif(Boost_NUMPY${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
394+
set(Boost_NUMPY_LIBRARY "${Boost_NUMPY${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_LIBRARY}")
395+
endif(Boost_NUMPY${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_FOUND)
396396
endif(enable-numpy-support)
397-
else(Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
397+
else(Boost_PYTHON${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_FOUND)
398398
set(Boost_PYTHON_FOUND OFF)
399-
endif(Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_FOUND)
399+
endif(Boost_PYTHON${Python_VERSION_MAJOR}${Python_VERSION_MINOR}_FOUND)
400400
endif(NOT Boost_PYTHON_FOUND)
401401
if(NOT Boost_PYTHON_FOUND)
402-
message(STATUS "Trying to find libboost_python-py${PYTHON_VERSION_MAJOR}")
402+
message(STATUS "Trying to find libboost_python-py${Python_VERSION_MAJOR}")
403403
find_package(Boost 1.36.0 COMPONENTS
404-
"python-py${PYTHON_VERSION_MAJOR}")
405-
if(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}_FOUND)
404+
"python-py${Python_VERSION_MAJOR}")
405+
if(Boost_PYTHON-PY${Python_VERSION_MAJOR}_FOUND)
406406
set(Boost_PYTHON_FOUND ON)
407-
set(Boost_PYTHON_LIBRARY "${Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}_LIBRARY}")
407+
set(Boost_PYTHON_LIBRARY "${Boost_PYTHON-PY${Python_VERSION_MAJOR}_LIBRARY}")
408408
if(enable-numpy-support)
409409
find_package(Boost 1.36.0 COMPONENTS
410-
"numpy-py${PYTHON_VERSION_MAJOR}")
411-
if(Boost_NUMPY-PY${PYTHON_VERSION_MAJOR}_FOUND)
410+
"numpy-py${Python_VERSION_MAJOR}")
411+
if(Boost_NUMPY-PY${Python_VERSION_MAJOR}_FOUND)
412412
set(Boost_NUMPY_FOUND ON)
413-
set(Boost_NUMPY_LIBRARY "${Boost_NUMPY-PY${PYTHON_VERSION_MAJOR}_LIBRARY}")
414-
endif(Boost_NUMPY-PY${PYTHON_VERSION_MAJOR}_FOUND)
413+
set(Boost_NUMPY_LIBRARY "${Boost_NUMPY-PY${Python_VERSION_MAJOR}_LIBRARY}")
414+
endif(Boost_NUMPY-PY${Python_VERSION_MAJOR}_FOUND)
415415
endif(enable-numpy-support)
416-
else(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}_FOUND)
416+
else(Boost_PYTHON-PY${Python_VERSION_MAJOR}_FOUND)
417417
set(Boost_PYTHON_FOUND OFF)
418-
endif(Boost_PYTHON-PY${PYTHON_VERSION_MAJOR}_FOUND)
418+
endif(Boost_PYTHON-PY${Python_VERSION_MAJOR}_FOUND)
419419
endif(NOT Boost_PYTHON_FOUND)
420420
if(NOT Boost_PYTHON_FOUND)
421-
message(STATUS "Trying to find libboost_python${PYTHON_VERSION_MAJOR}")
421+
message(STATUS "Trying to find libboost_python${Python_VERSION_MAJOR}")
422422
find_package(Boost 1.36.0 COMPONENTS
423-
"python${PYTHON_VERSION_MAJOR}")
424-
if(Boost_PYTHON${PYTHON_VERSION_MAJOR}_FOUND)
423+
"python${Python_VERSION_MAJOR}")
424+
if(Boost_PYTHON${Python_VERSION_MAJOR}_FOUND)
425425
set(Boost_PYTHON_FOUND ON)
426-
set(Boost_PYTHON_LIBRARY "${Boost_PYTHON${PYTHON_VERSION_MAJOR}_LIBRARY}")
426+
set(Boost_PYTHON_LIBRARY "${Boost_PYTHON${Python_VERSION_MAJOR}_LIBRARY}")
427427
if(enable-numpy-support)
428428
find_package(Boost 1.36.0 COMPONENTS
429-
"numpy${PYTHON_VERSION_MAJOR}")
430-
if(Boost_NUMPY${PYTHON_VERSION_MAJOR}_FOUND)
429+
"numpy${Python_VERSION_MAJOR}")
430+
if(Boost_NUMPY${Python_VERSION_MAJOR}_FOUND)
431431
set(Boost_NUMPY_FOUND ON)
432-
set(Boost_NUMPY_LIBRARY "${Boost_NUMPY${PYTHON_VERSION_MAJOR}_LIBRARY}")
433-
endif(Boost_NUMPY${PYTHON_VERSION_MAJOR}_FOUND)
432+
set(Boost_NUMPY_LIBRARY "${Boost_NUMPY${Python_VERSION_MAJOR}_LIBRARY}")
433+
endif(Boost_NUMPY${Python_VERSION_MAJOR}_FOUND)
434434
endif(enable-numpy-support)
435-
else(Boost_PYTHON${PYTHON_VERSION_MAJOR}_FOUND)
435+
else(Boost_PYTHON${Python_VERSION_MAJOR}_FOUND)
436436
set(Boost_PYTHON_FOUND OFF)
437-
endif(Boost_PYTHON${PYTHON_VERSION_MAJOR}_FOUND)
437+
endif(Boost_PYTHON${Python_VERSION_MAJOR}_FOUND)
438438
endif(NOT Boost_PYTHON_FOUND)
439439
if(NOT Boost_PYTHON_FOUND)
440440
message(STATUS "Trying to find libboost_python")

0 commit comments

Comments
 (0)