archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

CMake: avoid naming collision

Browse Source
This commit is contained in:
Campbell Barton
2017-10-04 01:35:24 +11:00
parent cbe07d980c
commit 239b38cd64
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build_files/cmake/Modules/FindPythonLibsUnix.cmake
View File

@@ -77,15 +77,12 @@ SET(_python_SEARCH_DIRS
# only search for the dirs if we havn't already # 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)) 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_TEST
SET(_python_ABI_FLAGS
"m;mu;u; " # release "m;mu;u; " # release
"dm;dmu;du;d" # debug "dm;dmu;du;d" # debug
) )
FOREACH(_CURRENT_ABI_FLAGS ${_PYTHON_ABI_FLAGS_TEST})
FOREACH(_CURRENT_ABI_FLAGS ${_python_ABI_FLAGS})
#IF(CMAKE_BUILD_TYPE STREQUAL Debug) #IF(CMAKE_BUILD_TYPE STREQUAL Debug)
# SET(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}") # SET(_CURRENT_ABI_FLAGS "d${_CURRENT_ABI_FLAGS}")
#ENDIF() #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_ABI_FLAGS)
UNSET(_CURRENT_PATH) UNSET(_CURRENT_PATH)
UNSET(_python_ABI_FLAGS) UNSET(_PYTHON_ABI_FLAGS_TEST)
ENDIF() ENDIF()
UNSET(_IS_INC_DEF) UNSET(_IS_INC_DEF)