cmake fix for Windows: link OpenCollada <libraryname>_d.lib in debug builds and ...
authorErwin Coumans <blender@erwincoumans.com>
Sun, 17 Jan 2010 19:34:01 +0000 (19:34 +0000)
committerErwin Coumans <blender@erwincoumans.com>
Sun, 17 Jan 2010 19:34:01 +0000 (19:34 +0000)
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.

CMakeLists.txt

index a926b4867469276fd7aab7ab0cb5a3b396dbd29a..a8c6e66678a2b0dcc3a86afb53d4c45f5af67f92 100644 (file)
@@ -79,7 +79,7 @@ OPTION(WITH_LZMA          "Enable best LZMA compression, used for pointcache" ON
 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 @@ IF(WIN32)
        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)