diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-05 17:39:45 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-05 17:39:45 +0400 |
| commit | 31ff2a6da254e17603f677261c79ce799d51db59 (patch) | |
| tree | f2da71a3939c985ddc3515dc1b9e5296e032d0d2 /CMakeLists.txt | |
| parent | 1bf56930ac18c7ae6c37079fb25446108e1e7309 (diff) | |
Enable lcms support on Windows.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f527f9d410c..e4ef5680e02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -478,13 +478,15 @@ IF(WIN32) SET(OPENCOLLADA_INC ${OPENCOLLADA}/include) SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa) - #pcre is bundled with openCollada - #SET(PCRE ${LIBDIR}/pcre) - #SET(PCRE_LIBPATH ${PCRE}/lib) SET(PCRE_LIB pcre) ENDIF(WITH_OPENCOLLADA) - # TODO: IF(WITH_LCMS) + IF(WITH_LCMS) + SET(LCMS ${LIBDIR}/lcms) + SET(LCMS_INC ${LCMS}/include) + SET(LCMS_LIBPATH ${LCMS}/lib) + SET(LCMS_LIB lcms) + ENDIF(WITH_LCMS) IF(WITH_FFMPEG) SET(FFMPEG ${LIBDIR}/ffmpeg) @@ -606,9 +608,6 @@ IF(WIN32) SET(OPENCOLLADA_INC ${OPENCOLLADA}/include) SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib) SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa) - #pcre is bundled with openCollada - #SET(PCRE ${LIBDIR}/pcre) - #SET(PCRE_LIBPATH ${PCRE}/lib) SET(PCRE_LIB pcre) ENDIF(WITH_OPENCOLLADA) |