From 55756719fbebf4ffdf0485de58532c73f84ecaac Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sun, 17 Jan 2010 19:34:01 +0000 Subject: cmake fix for Windows: link OpenCollada _d.lib in debug builds and .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. --- CMakeLists.txt | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index a926b486746..a8c6e66678a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) -- cgit v1.2.3 From f50ec12d9f1193a2f511f193734c800d750e0897 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sun, 17 Jan 2010 20:25:28 +0000 Subject: cmake fix broken OSX build: those openmp flags break OSX build, it might only work on other unixes that way --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index a8c6e66678a..81528e431a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,11 +82,11 @@ OPTION(WITH_INSTALL "Install accompanying scripts and language files neede OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" ON) # Unix defaults to OpenMP On -IF (UNIX) +IF(UNIX AND NOT APPLE) OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON) -ELSE(UNIX) +ELSE() OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF) -ENDIF(UNIX) +ENDIF() IF (APPLE) OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON) -- cgit v1.2.3 From 7d2b40c862de0bca8a12984f79771b0d68db392e Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sun, 17 Jan 2010 21:00:07 +0000 Subject: undo previous cmake fixes, Benoit already fixed it in cmake/macros.cmake --- CMakeLists.txt | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 81528e431a5..96df995f2e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -414,23 +414,7 @@ IF(WIN32) SET(OPENCOLLADA ${LIBDIR}/opencollada) SET(OPENCOLLADA_INC ${OPENCOLLADA}/include) SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) - 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 ) + SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 ) #pcre is bundled with openCollada #SET(PCRE ${LIBDIR}/pcre) #SET(PCRE_LIBPATH ${PCRE}/lib) -- cgit v1.2.3 From 8bcf66e1d16ece55f8736797f7d4180a456060ff Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Wed, 20 Jan 2010 03:46:28 +0000 Subject: CMake: * Added -Wno-unknown-pragmas to the cflags, silences warnings when OpenMP is diabled. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 96df995f2e7..45b13e4b647 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,7 +248,7 @@ IF(UNIX AND NOT APPLE) SET(PLATFORM_LINKFLAGS "-pthread") # Better warnings - SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement") + SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas") SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare") INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ) @@ -601,7 +601,7 @@ IF(APPLE) ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386") # Better warnings - SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement") + SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas") SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare") ENDIF(APPLE) -- cgit v1.2.3