forked from bartvdbraak/blender
cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables.
This commit is contained in:
parent
e7c8169086
commit
6790dbe9db
@ -608,13 +608,24 @@ elseif(WIN32)
|
||||
endif()
|
||||
|
||||
if(WITH_OPENCOLLADA)
|
||||
set(OPENCOLLADA ${LIBDIR}/opencollada)
|
||||
set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA}/include)
|
||||
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
|
||||
set(OPENCOLLADA_LIBRARIES OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF)
|
||||
set(OPENCOLLADA_INCLUDE_DIR
|
||||
${LIBDIR}/opencollada/include
|
||||
)
|
||||
set(OPENCOLLADA_LIBRARIES
|
||||
${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
|
||||
${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
|
||||
${LIBDIR}/opencollada/lib/OpenCOLLADABaseUtils.lib
|
||||
${LIBDIR}/opencollada/lib/OpenCOLLADAStreamWriter.lib
|
||||
${LIBDIR}/opencollada/lib/MathMLSolver.lib
|
||||
${LIBDIR}/opencollada/lib/GeneratedSaxParser.lib
|
||||
${LIBDIR}/opencollada/lib/xml2.lib
|
||||
${LIBDIR}/opencollada/lib/buffer.lib
|
||||
${LIBDIR}/opencollada/lib/ftoa.lib
|
||||
${LIBDIR}/opencollada/lib/UTF.lib
|
||||
)
|
||||
set(PCRE_LIB pcre)
|
||||
endif()
|
||||
|
||||
|
||||
if(WITH_CODEC_FFMPEG)
|
||||
set(FFMPEG ${LIBDIR}/ffmpeg)
|
||||
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/msvc)
|
||||
|
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user