[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26055] trunk/blender/CMakeLists.txt: cmake fix for Windows: link OpenCollada <libraryname>_d. lib in debug builds and <libraryname>.lib in release builds

[Erwin Coumans]

Revision: 26055
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26055
Author:   erwin
Date:     2010-01-17 20:34:01 +0100 (Sun, 17 Jan 2010)

Log Message:
-----------
cmake fix for Windows: link OpenCollada <libraryname>_d.lib in debug builds and <libraryname>.lib in release builds
this prevents crashing at startup of Blender in debug builds with cmake.

See bugreport by Andrea in the mailinglist here:
http://www.mail-archive.com/bf-committers@blender.org/msg00668.html

Also enabled WITH_OPENCOLLADA in cmake by default so the feature gets tested. If other devs like to keep OpenCollada it disabled, please revert the ON to OFF again.

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2010-01-17 19:20:05 UTC (rev 26054)
+++ trunk/blender/CMakeLists.txt	2010-01-17 19:34:01 UTC (rev 26055)
@@ -79,7 +79,7 @@
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
 OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
-OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
+OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	ON)
 
 # Unix defaults to OpenMP On
 IF (UNIX)
@@ -414,7 +414,23 @@
 	SET(OPENCOLLADA ${LIBDIR}/opencollada)
 	SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
 	SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-	SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 )
+	SET(OPENCOLLADA_LIB 
+		debug OpenCOLLADASaxFrameworkLoader_d 
+		debug OpenCOLLADAFramework_d 
+		debug OpenCOLLADABaseUtils_d 
+		debug OpenCOLLADAStreamWriter_d 
+		debug MathMLSolver_d 
+		debug GeneratedSaxParser_d 
+		debug UTF_d 
+		debug xml2_d 
+		optimized OpenCOLLADASaxFrameworkLoader 
+		optimized OpenCOLLADAFramework 
+		optimized OpenCOLLADABaseUtils 
+		optimized OpenCOLLADAStreamWriter 
+		optimized MathMLSolver 
+		optimized GeneratedSaxParser 
+		optimized UTF 
+		optimized xml2 )
 	#pcre is bundled with openCollada
 	#SET(PCRE ${LIBDIR}/pcre)
 	#SET(PCRE_LIBPATH ${PCRE}/lib)