diff options
| author | Andrea Weikert <elubie@gmx.net> | 2010-05-27 22:22:50 +0400 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2010-05-27 22:22:50 +0400 |
| commit | 1ba9766ab5cd8768c0fac2aab9a73fc3a21bf605 (patch) | |
| tree | 6103b1742664a10bfd4838979f2c9876921f8995 /CMakeLists.txt | |
| parent | 717701ed0f785f6452c37f412f43e08382694bc2 (diff) | |
== CMake ==
* updated for new libtiff
* also disabled opencollada for now as it caused errors
Note:
* WITH_INTERNATIONAL is enabled although this setting crashes Blender when compiling the Debug target - seems to work for other people though? If you encounter problems, try disabling this.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 19d1bdc9405..81a0f1eeaf7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ IF(UNIX AND NOT APPLE) OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF) ELSE() OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF) - OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" ON) + OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF) ENDIF() IF (APPLE) @@ -416,7 +416,7 @@ IF(WIN32) SET(TIFF ${LIBDIR}/tiff) SET(TIFF_INCLUDE_DIR ${TIFF}/include) - SET(TIFF_LIBRARY tiff) + SET(TIFF_LIBRARY libtiff) SET(TIFF_LIBPATH ${TIFF}/lib) SET(WINTAB_INC ${LIBDIR}/wintab/include) |