diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-19 17:06:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-19 17:06:21 +0400 |
| commit | 6790dbe9dbafea549ed0e6cc107a57649cae2e29 (patch) | |
| tree | 5325def057ed3850ecc7c6d36b84a69d7e49a4cd | |
| parent | e7c8169086103aacdc8a9df4a8b973486eb69d1d (diff) | |
cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables.
| -rw-r--r-- | CMakeLists.txt | 21 | ||||
| -rw-r--r-- | build_files/cmake/Modules/FindPythonLibsUnix.cmake | 7 |
2 files changed, 18 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 513211a07da..c58ff1f4ed8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) 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() |