[Bf-blender-cvs] [36e65a7] master: CMake: clarify missing Python package message
Campbell Barton
noreply at git.blender.org
Sun Jan 17 06:17:48 CET 2016
Commit: 36e65a7b73a1589ee906a5ff7c083d617df13e20
Author: Campbell Barton
Date: Sun Jan 17 16:01:32 2016 +1100
Branches: master
https://developer.blender.org/rB36e65a7b73a1589ee906a5ff7c083d617df13e20
CMake: clarify missing Python package message
Blender builds properly without extra Python packages,
avoid FUD for new devs.
===================================================================
M build_files/cmake/macros.cmake
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 00313ba..6194bd8 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1467,17 +1467,21 @@ function(find_python_package
)
if(NOT EXISTS "${PYTHON_${_upper_package}_PATH}")
- message(WARNING "'${package}' path could not be found in:\n"
- "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${package}', "
- "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/site-packages/${package}', "
- "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/dist-packages/${package}', "
- "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/dist-packages/${package}', "
- "WITH_PYTHON_INSTALL_${_upper_package} option will be ignored when installing python")
+ message(WARNING
+ "Python package '${package}' path could not be found in:\n"
+ "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${package}', "
+ "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/site-packages/${package}', "
+ "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/dist-packages/${package}', "
+ "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/dist-packages/${package}', "
+ "\n"
+ "The 'WITH_PYTHON_INSTALL_${_upper_package}' option will be ignored when installing Python.\n"
+ "The build will be usable, only add-ons that depend on this package won't be functional."
+ )
set(WITH_PYTHON_INSTALL_${_upper_package} OFF PARENT_SCOPE)
else()
message(STATUS "${package} found at '${PYTHON_${_upper_package}_PATH}'")
endif()
- endif()
+ endif()
endfunction()
# like Python's 'print(dir())'
More information about the Bf-blender-cvs
mailing list