diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-04 20:18:05 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-04 20:18:05 +0300 |
| commit | 63c472b4f9f7eae787bf4ce36160a28a1777bc76 (patch) | |
| tree | 0e3144ddeacb83b7ff2a769af178824b1dea5563 /build_files | |
| parent | 9422db7796e17bc23a9544d44f2a2e00a9b7e775 (diff) | |
| parent | 296757804cc2e97a3d95b4e44a6cc5d508e1c345 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/Modules/FindPythonLibsUnix.cmake | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake index 9d79bdd778d..493fb0df6a7 100644 --- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake +++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake @@ -38,7 +38,7 @@ IF(NOT PYTHON_ROOT_DIR AND NOT $ENV{PYTHON_ROOT_DIR} STREQUAL "") SET(PYTHON_ROOT_DIR $ENV{PYTHON_ROOT_DIR}) ENDIF() -SET(PYTHON_VERSION 3.5 CACHE STRING "Python Version (major and minor only)") +SET(PYTHON_VERSION 3.6 CACHE STRING "Python Version (major and minor only)") MARK_AS_ADVANCED(PYTHON_VERSION) @@ -77,15 +77,12 @@ SET(_python_SEARCH_DIRS # only search for the dirs if we havn't already IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_LIB_PATH_DEF)) - - SET(_python_ABI_FLAGS + SET(_PYTHON_ABI_FLAGS_TEST "m;mu;u; " # release "dm;dmu;du;d" # debug ) - - - FOREACH(_CURRENT_ABI_FLAGS ${_python_ABI_FLAGS}) + FOREACH(_CURRENT_ABI_FLAGS ${_PYTHON_ABI_FLAGS_TEST}) #IF(CMAKE_BUILD_TYPE STREQUAL Debug) # SET(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}") #ENDIF() @@ -170,7 +167,7 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_ UNSET(_CURRENT_ABI_FLAGS) UNSET(_CURRENT_PATH) - UNSET(_python_ABI_FLAGS) + UNSET(_PYTHON_ABI_FLAGS_TEST) ENDIF() UNSET(_IS_INC_DEF) |