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 /CMakeLists.txt | |
| parent | e7c8169086103aacdc8a9df4a8b973486eb69d1d (diff) | |
cmake: fix for recent break in msvc+collada, also dont cache duplicate python include/library variables.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 21 |
1 files changed, 16 insertions, 5 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) |