Make BOOST_PYTHON_MODULE_NAME configurable on all platforms
@@ -51,10 +51,9 @@ set( STATIC_BOOST ON CACHE BOOL ${STATIC_BOOST_DESC} )
if( INCLUDE_PYTHON )
set( USE_PYTHON_VERSIONS_DESC "Specifies which version of Python to build Malmo with Python bindings" )
- set( MACOS_USE_PYTHON_MODULE_DESC "Specifies which Python module to build Malmo on Apple MacOS" )
set( USE_PYTHON_VERSIONS 3.6 CACHE STRING ${USE_PYTHON_VERSIONS_DESC} )
- # Boost has switched to using a 2 digit naming convention for python on MacOS.
- set( MACOS_USE_PYTHON_MODULE "python37" CACHE STRING ${MACOS_USE_PYTHON_MODULE_DESC} )
+ set( BOOST_PYTHON_NAME_DESC "Specifies which Boost Python module to build Malmo with" )
+ set( BOOST_PYTHON_NAME "python3" CACHE STRING ${BOOST_PYTHON_NAME_DESC} )
endif()
set( WARNINGS_AS_ERRORS OFF )
@@ -106,11 +105,7 @@ SET(Boost_ADDITIONAL_VERSIONS "1.67" "1.67.0")
SET(BOOST_PYTHON_MODULE_NAME "python")
if ( USE_PYTHON_VERSIONS VERSION_GREATER 3 )
- if ( APPLE )
- SET( BOOST_PYTHON_MODULE_NAME ${MACOS_USE_PYTHON_MODULE} )
- else()
- SET( BOOST_PYTHON_MODULE_NAME "python3" )
- endif()
+ SET( BOOST_PYTHON_MODULE_NAME ${BOOST_PYTHON_NAME} )
endif()
if( WIN32 )
