Commit: 357787b06bf376d54db216d15a59a5bc6387139e
Author: Campbell Barton
Date: Wed Mar 30 22:44:44 2016 +1100
Branches: blender-v2.77-release
https://developer.blender.org/rB357787b06bf376d54db216d15a59a5bc6387139e
Fix T46623: OSX bpy.app.binary_path_python incorrect
CMake's PYTHON_EXECUTABLE wasn't set.
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2eabd4b..7232e5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1988,14 +1988,14 @@ elseif(APPLE)
if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
# normally cached but not since we include them with
blender
set(PYTHON_INCLUDE_DIR
"${LIBDIR}/python/include/python${PYTHON_VERSION}m")
- # set(PYTHON_EXECUTABLE
"${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
+ set(PYTHON_EXECUTABLE
"${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
set(PYTHON_LIBRARY python${PYTHON_VERSION}m)
set(PYTHON_LIBPATH
"${LIBDIR}/python/lib/python${PYTHON_VERSION}")
# set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't
build with this enabled
else()
# module must be compiled against Python framework
set(PYTHON_INCLUDE_DIR
"/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/include/python${PYTHON_VERSION}m")
- set(PYTHON_EXECUTABLE
"/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/bin/python${PYTHON_VERSION}")
+ set(PYTHON_EXECUTABLE
"/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/bin/python${PYTHON_VERSION}m")
#set(PYTHON_LIBRARY python${PYTHON_VERSION})
set(PYTHON_LIBPATH
"/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}m")
#set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework
Python") # won't build with this enabled
@@ -2004,6 +2004,10 @@ elseif(APPLE)
# uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
+
+ if(NOT EXISTS "${PYTHON_EXECUTABLE}")
+ message(FATAL_ERROR "Python executable missing:
${PYTHON_EXECUTABLE}")
+ endif()
endif()
if(WITH_FFTW3)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
