diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 74a662acc02..cb104149d33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -556,14 +556,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.3 \ -# -D PYTHON_INCLUDE_DIR=/opt/py33/include/python3.3d \ -# -D PYTHON_LIBRARY=/opt/py33/lib/libpython3.3d.so +# -D PYTHON_VERSION=3.4 \ +# -D PYTHON_INCLUDE_DIR=/opt/py34/include/python3.4d \ +# -D PYTHON_LIBRARY=/opt/py34/lib/libpython3.4d.so # # On Macs: # cmake ../blender \ -# -D PYTHON_INCLUDE_DIR=/System/Library/Frameworks/Python.framework/Versions/3.3/include/python3.3 \ -# -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/config \ +# -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 \ # -G Xcode # # When changing any of this remember to update the notes in doc/build_systems/cmake.txt @@ -591,7 +591,7 @@ if(UNIX AND NOT APPLE) find_package_wrapper(Freetype REQUIRED) if(WITH_PYTHON) - # No way to set py33. remove for now. + # No way to set py34. remove for now. # find_package(PythonLibs) # Use our own instead, since wothout py is such a rare case, @@ -1200,7 +1200,7 @@ elseif(WIN32) endif() if(WITH_PYTHON) - set(PYTHON_VERSION 3.3) # CACHE STRING) + set(PYTHON_VERSION 3.4) # CACHE STRING) string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION}) # Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs @@ -1452,9 +1452,11 @@ elseif(WIN32) if(WITH_PYTHON) # normally cached but not since we include them with blender - set(PYTHON_VERSION 3.3) # CACHE STRING) + set(PYTHON_VERSION 3.4) # 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/python33mw.lib") # CACHE FILEPATH) + set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}mw.lib") # CACHE FILEPATH) + unset(_PYTHON_VERSION_NO_DOTS) # uncached vars set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}") |