[Bf-blender-cvs] [239b38cd648] master: CMake: avoid naming collision

Campbell Barton noreply at git.blender.org
Tue Oct 3 16:24:51 CEST 2017


Commit: 239b38cd64849ebd26360e4c738b4784a1a9d19d
Author: Campbell Barton
Date:   Wed Oct 4 01:35:24 2017 +1100
Branches: master
https://developer.blender.org/rB239b38cd64849ebd26360e4c738b4784a1a9d19d

CMake: avoid naming collision

===================================================================

M	build_files/cmake/Modules/FindPythonLibsUnix.cmake

===================================================================

diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
index e9fec25f815..493fb0df6a7 100644
--- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake
+++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
@@ -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)



More information about the Bf-blender-cvs mailing list