[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29030] trunk/blender/CMakeLists.txt: == CMake ==

[Andrea Weikert]

Revision: 29030
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29030
Author:   elubie
Date:     2010-05-27 20:22:50 +0200 (Thu, 27 May 2010)

Log Message:
-----------
== 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.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2010-05-27 14:00:32 UTC (rev 29029)
+++ trunk/blender/CMakeLists.txt	2010-05-27 18:22:50 UTC (rev 29030)
@@ -92,7 +92,7 @@
 	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 @@
 
 	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)