Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-11-27 10:00:02 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-11-27 10:00:02 +0300
commit5680ac911b94531c1525d53d9f20ad1ff5a1ea4e (patch)
treeacc720d511b0f5330e799dd0f565eea1cf22ab94
parent2fa1f60d8e3d6d01e5b3c213efbdc8674ab056d9 (diff)
missed last commit
-rw-r--r--CMakeLists.txt8
-rw-r--r--build_files/cmake/Modules/FindPythonLibsUnix.cmake2
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec45b3426fe..10c2f65e84a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -811,8 +811,8 @@ set(PLATFORM_LINKFLAGS_DEBUG "")
# On Unix:
# cmake ../blender \
# -D PYTHON_VERSION=3.5 \
-# -D PYTHON_INCLUDE_DIR=/opt/py34/include/python3.5d \
-# -D PYTHON_LIBRARY=/opt/py34/lib/libpython3.5d.so
+# -D PYTHON_INCLUDE_DIR=/opt/py35/include/python3.5d \
+# -D PYTHON_LIBRARY=/opt/py35/lib/libpython3.5d.so
#
# On Macs:
# cmake ../blender \
@@ -896,10 +896,10 @@ if(UNIX AND NOT APPLE)
# else values are set below for all platforms
if(WITH_PYTHON)
- # No way to set py34. remove for now.
+ # No way to set py35, remove for now.
# find_package(PythonLibs)
- # Use our own instead, since wothout py is such a rare case,
+ # Use our own instead, since without py is such a rare case,
# require this package
# XXX Linking errors with debian static python :/
# find_package_wrapper(PythonLibsUnix REQUIRED)
diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
index 7dcdc078c91..9d79bdd778d 100644
--- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake
+++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
@@ -199,7 +199,7 @@ IF(PYTHONLIBSUNIX_FOUND)
)
# we need this for installation
- # XXX No more valid with debian-like py3.4 packages...
+ # XXX No more valid with debian-like py3.5 packages...
# GET_FILENAME_COMPONENT(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
# not required for build, just used when bundling Python.