Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables.

Browse Source
This commit is contained in:
Campbell Barton
2011-06-19 13:06:21 +00:00
parent e7c8169086
commit 6790dbe9db
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,8 +77,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibsUnix DEFAULT_MSG
if(PYTHONLIBSUNIX_FOUND)
# Assign cache items
set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR} CACHE STRING "")
set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} CACHE STRING "")
set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
set(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
# we need this for installation
get_filename_component(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH)
@@ -87,10 +87,7 @@ if(PYTHONLIBSUNIX_FOUND)
# set(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
mark_as_advanced(
PYTHON_INCLUDE_DIRS
PYTHON_INCLUDE_DIR
PYTHON_LIBRARIES
PYTHON_LIBRARY
PYTHON_LIBPATH
)
endif()