Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-06-19 17:06:21 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-06-19 17:06:21 +0400
commit6790dbe9dbafea549ed0e6cc107a57649cae2e29 (patch)
tree5325def057ed3850ecc7c6d36b84a69d7e49a4cd /build_files
parente7c8169086103aacdc8a9df4a8b973486eb69d1d (diff)
cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/Modules/FindPythonLibsUnix.cmake7
1 files changed, 2 insertions, 5 deletions
diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
index 2a4133581a7..489b13b15fd 100644
--- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake
+++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake
@@ -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()