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 09:24:11 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-11-27 09:26:08 +0300
commit2fa1f60d8e3d6d01e5b3c213efbdc8674ab056d9 (patch)
treed3cf8b6ba4d2e83faaab56d231db9b9cef685eb6 /CMakeLists.txt
parent254282c6cbd0c9f6031fb108f858951d8563a809 (diff)
CMake/SCons: set Python to 3.5
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7be4ebdb61..ec45b3426fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -810,14 +810,14 @@ set(PLATFORM_LINKFLAGS_DEBUG "")
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
# On Unix:
# cmake ../blender \
-# -D PYTHON_VERSION=3.4 \
-# -D PYTHON_INCLUDE_DIR=/opt/py34/include/python3.4d \
-# -D PYTHON_LIBRARY=/opt/py34/lib/libpython3.4d.so
+# -D PYTHON_VERSION=3.5 \
+# -D PYTHON_INCLUDE_DIR=/opt/py34/include/python3.5d \
+# -D PYTHON_LIBRARY=/opt/py34/lib/libpython3.5d.so
#
# On Macs:
# cmake ../blender \
-# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.4/include/python3.4 \
-# -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.4/lib/python3.4/config \
+# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.5/include/python3.5 \
+# -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.5/lib/python3.5/config \
# -G Xcode
#
# When changing any of this remember to update the notes in doc/build_systems/cmake.txt
@@ -1734,7 +1734,7 @@ elseif(WIN32)
if(WITH_PYTHON)
# normally cached but not since we include them with blender
- set(PYTHON_VERSION 3.4) # CACHE STRING)
+ set(PYTHON_VERSION 3.5) # CACHE STRING)
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}mw.lib") # CACHE FILEPATH)
@@ -1939,7 +1939,7 @@ elseif(APPLE)
endif()
if(WITH_PYTHON)
- # we use precompiled libraries for py 3.4 and up by default
+ # we use precompiled libraries for py 3.5 and up by default
set(PYTHON_VERSION 3.5)
if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
# normally cached but not since we include them with blender