== CMake ==
authorAndrea Weikert <elubie@gmx.net>
Thu, 27 May 2010 18:22:50 +0000 (18:22 +0000)
committerAndrea Weikert <elubie@gmx.net>
Thu, 27 May 2010 18:22:50 +0000 (18:22 +0000)
* 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.

CMakeLists.txt

index 19d1bdc94051b56781ffd47545c016620fb918af..81a0f1eeaf7591c9510b453f62f2287c63461a36 100644 (file)
@@ -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)